From 17b4e4a194ea513f776bab5010d88d24a51b9d9e Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Sat, 26 Nov 2011 14:23:00 -0800 Subject: Set new default values for the optimizer switch flags 'derived_merge' and 'derived_with_keys'. Now they are set on by default. --- mysql-test/t/func_str.test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mysql-test/t/func_str.test') diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 92c4bae5327..4302bf5e7eb 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1314,9 +1314,13 @@ DROP TABLE t1, t2; drop table if exists t1; --enable_warnings create table t1(f1 tinyint default null)engine=myisam; -insert into t1 values (-1),(null); +insert into t1 values (-1),(null); + +set @tmp_optimizer_switch=@@optimizer_switch; +set optimizer_switch='derived_merge=off,derived_with_keys=off'; explain select 1 as a from t1,(select decode(f1,f1) as b from t1) a; explain select 1 as a from t1,(select encode(f1,f1) as b from t1) a; +set optimizer_switch=@tmp_optimizer_switch; drop table t1; --echo # -- cgit v1.2.1