Skip to content

M
MariaDB
Commit 40acadc7 authored by Sergey Petrunya's avatar Sergey Petrunya
Browse files
Options

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

parent d9513849
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result
View file @ 40acadc7
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 d1;
DROP DATABASE IF EXISTS d2; DROP DATABASE IF EXISTS d2;
DROP DATABASE IF EXISTS d3; DROP DATABASE IF EXISTS d3;
...@@ -1106,3 +1107,4 @@ c1 c2 ...@@ -1106,3 +1107,4 @@ c1 c2
DROP DATABASE d1; DROP DATABASE d1;
DROP DATABASE d2; DROP DATABASE d2;
DROP DATABASE d3; DROP DATABASE d3;
set optimizer_switch=@bug41996_extra1_tmp;
mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test
View file @ 40acadc7
set optimizer_use_mrr='disable'; set @bug41996_extra1_tmp=@@optimizer_switch;
set optimizer_switch='mrr=off';
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS d1; DROP DATABASE IF EXISTS d1;
DROP DATABASE IF EXISTS d2; DROP DATABASE IF EXISTS d2;
...@@ -484,4 +485,5 @@ SELECT * FROM d3.t3 ORDER BY c1; ...@@ -484,4 +485,5 @@ SELECT * FROM d3.t3 ORDER BY c1;
DROP DATABASE d1; DROP DATABASE d1;
DROP DATABASE d2; DROP DATABASE d2;
DROP DATABASE d3; DROP DATABASE d3;
set optimizer_switch=@bug41996_extra1_tmp;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7