зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
29dce6acb0
Коммит
91fafca168
|
@ -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";
|
||||
|
|
|
@ -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))";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче