1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Buildbot fixes: don't use @@optimizer_use_mrr, it has been moved into @@optimizer_switch

Browse Source
This commit is contained in:
Sergey Petrunya 2011-06-03 11:32:21 +04:00
parent d9513849bc
commit 40acadc779
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result
View File

@ -1,4 +1,5 @@
set optimizer_use_mrr='disable';
set @bug41996_extra1_tmp=@@optimizer_switch;
set optimizer_switch='mrr=off';
DROP DATABASE IF EXISTS d1;
DROP DATABASE IF EXISTS d2;
DROP DATABASE IF EXISTS d3;
@ -1106,3 +1107,4 @@ c1 c2
DROP DATABASE d1;
DROP DATABASE d2;
DROP DATABASE d3;
set optimizer_switch=@bug41996_extra1_tmp;

4
mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test
View File

@ -1,4 +1,5 @@
set optimizer_use_mrr='disable';
set @bug41996_extra1_tmp=@@optimizer_switch;
set optimizer_switch='mrr=off';
--disable_warnings
DROP DATABASE IF EXISTS d1;
DROP DATABASE IF EXISTS d2;
@ -484,4 +485,5 @@ SELECT * FROM d3.t3 ORDER BY c1;
DROP DATABASE d1;
DROP DATABASE d2;
DROP DATABASE d3;
set optimizer_switch=@bug41996_extra1_tmp;