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/subselect3.test | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mysql-test/t/subselect3.test') diff --git a/mysql-test/t/subselect3.test b/mysql-test/t/subselect3.test index 7e4943d85ba..aadc08e18e0 100644 --- a/mysql-test/t/subselect3.test +++ b/mysql-test/t/subselect3.test @@ -925,8 +925,11 @@ set @@optimizer_switch='materialization=off'; # # FirstMatch referring to a derived table # +set @tmp_optimizer_switch=@@optimizer_switch; +set optimizer_switch='derived_merge=off,derived_with_keys=off'; explain select * from (select a from t0) X where a in (select a from t1); drop table t0, t1; +set optimizer_switch=@tmp_optimizer_switch; # # LooseScan: Check if we can pick it together with range access -- cgit v1.2.1 From a910e8ef5b5d33cd600acaba9ec3cc8c49881196 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Thu, 15 Dec 2011 14:26:59 -0800 Subject: Made join_cache_level == 2 by default. --- mysql-test/t/subselect3.test | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mysql-test/t/subselect3.test') diff --git a/mysql-test/t/subselect3.test b/mysql-test/t/subselect3.test index aadc08e18e0..ec6ceff8822 100644 --- a/mysql-test/t/subselect3.test +++ b/mysql-test/t/subselect3.test @@ -4,6 +4,14 @@ drop table if exists t0, t1, t2, t3, t4, t5, t11, t12, t21, t22; set @subselect3_tmp= @@optimizer_switch; set optimizer_switch='semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on'; +if (`select @join_cache_level_for_subselect3_test is null`) +{ + set join_cache_level=1; +} +if (`select @join_cache_level_for_subselect3_test is not null`) +{ + set join_cache_level=@join_cache_level_for_subselect3_test; +} # # 1. Subquery with GROUP/HAVING -- cgit v1.2.1