summaryrefslogtreecommitdiff
path: root/mysql-test/include/index_merge1.inc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-11-26 14:23:00 -0800
committerIgor Babaev <igor@askmonty.org>2011-11-26 14:23:00 -0800
commit17b4e4a194ea513f776bab5010d88d24a51b9d9e (patch)
treeffe20f58c4b68af894ebedf30cb3dba679300a66 /mysql-test/include/index_merge1.inc
parentd84ea521c539e4f63511f1787df4b4dcb12886d1 (diff)
downloadmariadb-git-17b4e4a194ea513f776bab5010d88d24a51b9d9e.tar.gz
Set new default values for the optimizer switch flags 'derived_merge'
and 'derived_with_keys'. Now they are set on by default.
Diffstat (limited to 'mysql-test/include/index_merge1.inc')
-rw-r--r--mysql-test/include/index_merge1.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index 238d3797fe8..4ad9c2046e0 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -264,7 +264,10 @@ explain select * from t1 where key1=3 or key2=4
union select * from t1 where key1<4 or key3=5;
# index merge in subselect
+set @tmp_optimizer_switch=@@optimizer_switch;
+set optimizer_switch='derived_merge=off,derived_with_keys=off';
explain select * from (select * from t1 where key1 = 3 or key2 =3) as Z where key8 >5;
+set optimizer_switch=@tmp_optimizer_switch;
# 12. check for long index_merges.
create table t3 like t0;