summaryrefslogtreecommitdiff
path: root/mysql-test/t/index_merge_innodb.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-01 23:39:39 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-01 23:39:39 -0800
commit80377bbf6dadd1772f6b4f4d4258892a023d586a (patch)
treee7714b26e34057ed2f21770099001373c996cb51 /mysql-test/t/index_merge_innodb.test
parent7970b3346a9909f2d4e63b528a4d3bb5f11515ae (diff)
downloadmariadb-git-80377bbf6dadd1772f6b4f4d4258892a023d586a.tar.gz
MWL #21: "index_merge: non-ROR intersection".
The second (final) patch.
Diffstat (limited to 'mysql-test/t/index_merge_innodb.test')
-rw-r--r--mysql-test/t/index_merge_innodb.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test
index e68f414e0bc..161ef0856ae 100644
--- a/mysql-test/t/index_merge_innodb.test
+++ b/mysql-test/t/index_merge_innodb.test
@@ -18,6 +18,11 @@ let $engine_type= InnoDB;
# InnoDB does not support Merge tables (affects include/index_merge1.inc)
let $merge_table_support= 0;
+set @optimizer_switch_save= @@optimizer_switch;
+
+set optimizer_switch='index_merge_sort_intersection=off';
+
+
# The first two tests are disabled because of non deterministic explain output.
# If include/index_merge1.inc can be enabled for InnoDB and all other
# storage engines, please remove the subtest for Bug#21277 from
@@ -82,3 +87,5 @@ SELECT COUNT(*) FROM
WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t;
DROP TABLE t1;
+
+set optimizer_switch= @optimizer_switch_save;