From ea20355dfe228f3346f331df521fcfc54cb71fc2 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 15 Nov 2005 04:54:45 +0000
Subject: Bug 314080: [MySQL5] checksetup.pl: Unknown column 'profiles.userid'
 in 'on clause' - Patch by Olav Vitters <bugzilla-mozilla@bkor.dhs.org> r=joel
 r=mkanat r=lance a=justdave

---
 checksetup.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/checksetup.pl b/checksetup.pl
index 16edfae3d..e8c5e1da9 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -4134,8 +4134,8 @@ $dbh->do("DELETE FROM user_group_map WHERE grant_type = " . GRANT_DERIVED);
 $sth = $dbh->prepare("SELECT profiles.userid, profiles.login_name,
                          groups.id, groups.userregexp,
                          user_group_map.group_id
-                         FROM profiles
-                         CROSS JOIN groups
+                         FROM (profiles
+                         CROSS JOIN groups)
                          LEFT JOIN user_group_map
                          ON user_group_map.user_id = profiles.userid
                          AND user_group_map.group_id = groups.id
-- 
cgit v1.2.3-24-g4f1b