Bug 314080: [MySQL5] checksetup.pl: Unknown column 'profiles.userid' in 'on clause...

diff --git a/checksetup.pl b/checksetup.pl
index 16edfae3d8c80005a191573519ef50acbc705575..e8c5e1da9e92bce5d1fb6fda91dee365e9e5ac6b 100755 (executable)
--- 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