summaryrefslogtreecommitdiff
path: root/mysql-test/t/innodb_mrr.test
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-06-03 00:25:58 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-06-03 00:25:58 +0400
commit9482e387e6a2e947dc0679f01262a983f24e848c (patch)
treed9e2b89553919cdfad739712e6432dd5b678f9b4 /mysql-test/t/innodb_mrr.test
parentc44c1bd188fc01ca56490d20e855035e8299b33f (diff)
downloadmariadb-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/t/innodb_mrr.test')
-rw-r--r--mysql-test/t/innodb_mrr.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/innodb_mrr.test b/mysql-test/t/innodb_mrr.test
index 7a3dc9f668e..2ae8744bca0 100644
--- a/mysql-test/t/innodb_mrr.test
+++ b/mysql-test/t/innodb_mrr.test
@@ -370,14 +370,14 @@ set join_buffer_size=@my_save_join_buffer_size;
--echo #
create table t1 (pk int primary key, b int, c int default 0, index idx(b)) engine=innodb;
insert into t1(pk,b) values (3, 30), (2, 20), (9, 90), (7, 70), (4, 40), (5, 50), (10, 100), (12, 120);
-set @my_save_optimizer_use_mrr=@@optimizer_use_mrr;
-set optimizer_use_mrr='disable';
+set @bug665669_tmp=@@optimizer_switch;
+set optimizer_switch='mrr=off';
explain select * from t1 where b > 1000;
--echo # The following two must produce indentical results:
select * from t1 where pk < 2 or pk between 3 and 4;
select * from t1 where pk < 2 or pk between 3 and 4;
drop table t1;
-set optimizer_use_mrr = @my_save_optimizer_use_mrr;
+set optimizer_switch = @bug665669_tmp;
--echo #
--echo # Bug#43360 - Server crash with a simple multi-table update
--echo #