summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-11-15 05:54:45 +0100
committerlpsolit%gmail.com <>2005-11-15 05:54:45 +0100
commitea20355dfe228f3346f331df521fcfc54cb71fc2 (patch)
tree9286d5ca7ae9d2c863511d185d708cf59dfb6c11
parent7c0a44b743db440fee8a63a71f1742fd8c92df03 (diff)
downloadbugzilla-ea20355dfe228f3346f331df521fcfc54cb71fc2.tar.gz
bugzilla-ea20355dfe228f3346f331df521fcfc54cb71fc2.tar.xz
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
-rwxr-xr-xchecksetup.pl4
1 files 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