Bug 107718 pt 2 - use subtraction instead of the ~ operator, which older

mysql versions don't support. Remove the checksetup.pl restriction, too.

r=jake x2

diff --git a/checksetup.pl b/checksetup.pl
index a72492226ece2b9671e309ff7bb3c4ddcb051df8..0a3edac79f4f120f547c798aff7333fe6a1f0fca 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -773,15 +773,7 @@ my $drh = DBI->install_driver($db_base)
 if ($my_db_check) {
     # Do we have the database itself?
 
-    # XXX - as part of the fix for dataloss bug 107718, we need the ~ 
-    # operator, which isn't available in earlier versions, despite what
-    # the docs say. This is temporary, as we won't need bit fiddling
-    # once bug 60822 is fixed.
-    # A requirement for 3.23.x may become permenant though - see
-    # http://bugzilla.mozilla.org/show_bug.cgi?id=87958
-    my $sql_want = "3.23.5";
-
-    #my $sql_want = "3.22.5";  # minimum version of MySQL
+    my $sql_want = "3.22.5";  # minimum version of MySQL
 
 # original DSN line was:
 #    my $dsn = "DBI:$db_base:$my_db_name;$my_db_host;$my_db_port";

diff --git a/process_bug.cgi b/process_bug.cgi
index 7f3d32098f9add0094cd927408cf1e700aa1ebe0..9e90827f1d26d6f1a9a701d883fd02f02251e85b 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -43,7 +43,8 @@ use vars %::versions,
     %::legal_platform,
     %::legal_priority,
     %::target_milestone,
-    %::legal_severity;
+    %::legal_severity,
+    %::superusergroupset;
 
 my $whoid = confirm_login();
 
@@ -563,7 +564,9 @@ if($::usergroupset ne '0') {
     }
     if ($groupAdd ne "0" || $groupDel ne "0") {
         DoComma();
-        $::query .= "groupset = ((groupset & ~($groupDel)) | ($groupAdd))";
+        # mysql < 3.23.5 doesn't support the ~ operator, even though
+        # the docs say that it does
+        $::query .= "groupset = ((groupset & ($::superusergroupset - ($groupDel))) | ($groupAdd))";
     }
 }