From 40acadc779ff6ea2732209d3ab3017f4475019fa Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Fri, 3 Jun 2011 11:32:21 +0400 Subject: [PATCH] Buildbot fixes: don't use @@optimizer_use_mrr, it has been moved into @@optimizer_switch --- .../optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result | 4 +++- .../optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result index 94b024a9c8f..96c8e1c6d43 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1-innodb.result @@ -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; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test index deb90136326..09fcccb06d1 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1-innodb.test @@ -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;