From: lpsolit%gmail.com <>
Date: Tue, 15 Nov 2005 04:54:45 +0000 (+0000)
Subject: Bug 314080: [MySQL5] checksetup.pl: Unknown column 'profiles.userid' in 'on clause... 
X-Git-Tag: bugzilla-2.22rc1~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea20355dfe228f3346f331df521fcfc54cb71fc2;p=thirdparty%2Fbugzilla.git

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
---

diff --git a/checksetup.pl b/checksetup.pl
index 16edfae3d8..e8c5e1da9e 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