diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-06-03 00:25:58 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-06-03 00:25:58 +0400 |
| commit | 9482e387e6a2e947dc0679f01262a983f24e848c (patch) | |
| tree | d9e2b89553919cdfad739712e6432dd5b678f9b4 /mysql-test/suite/optimizer_unfixed_bugs | |
| parent | c44c1bd188fc01ca56490d20e855035e8299b33f (diff) | |
| download | mariadb-git-9482e387e6a2e947dc0679f01262a983f24e848c.tar.gz | |
Change optimizer_use_mrr=auto|disable|force
to be optimizer_switch flags mrr=on|off and mrr_cost_based=on|off.
Diffstat (limited to 'mysql-test/suite/optimizer_unfixed_bugs')
| -rw-r--r-- | mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1.test | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result index 94b024a9c8f..ab24c2c1166 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result +++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug41996-extra1.result @@ -1,4 +1,5 @@ -set optimizer_use_mrr='disable'; +set @bug41996_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_tmp; diff --git a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1.test b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1.test index deb90136326..5170ec22c59 100644 --- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1.test +++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug41996-extra1.test @@ -1,4 +1,5 @@ -set optimizer_use_mrr='disable'; +set @bug41996_tmp=@@optimizer_switch; +set optimizer_switch='mrr=off'; --disable_warnings DROP DATABASE IF EXISTS d1; DROP DATABASE IF EXISTS d2; @@ -484,4 +485,4 @@ SELECT * FROM d3.t3 ORDER BY c1; DROP DATABASE d1; DROP DATABASE d2; DROP DATABASE d3; - +set optimizer_switch=@bug41996_tmp; |