summaryrefslogtreecommitdiff
path: root/mysql-test/t/index_merge_myisam.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/index_merge_myisam.test')
-rw-r--r--mysql-test/t/index_merge_myisam.test8
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/t/index_merge_myisam.test b/mysql-test/t/index_merge_myisam.test
index b3514e3f053..5431c6dba2b 100644
--- a/mysql-test/t/index_merge_myisam.test
+++ b/mysql-test/t/index_merge_myisam.test
@@ -14,6 +14,10 @@ let $engine_type= MyISAM;
# MyISAM supports Merge tables
let $merge_table_support= 1;
+set @optimizer_switch_save= @@optimizer_switch;
+
+set optimizer_switch='index_merge_sort_intersection=off';
+
--source include/index_merge1.inc
--source include/index_merge_ror.inc
--source include/index_merge2.inc
@@ -92,7 +96,7 @@ set optimizer_switch='default,index_merge=off';
explain select * from t1 where a=10 and b=10;
--echo No intersect if it is disabled:
-set optimizer_switch='default,index_merge_intersection=off';
+set optimizer_switch='default,index_merge_sort_intersection=off,index_merge_intersection=off';
explain select * from t1 where a=10 and b=10;
--echo Do intersect when union was disabled
@@ -121,3 +125,5 @@ set optimizer_switch=default;
drop table t0, t1;
+set optimizer_switch= @optimizer_switch_save;
+