From f5dac20f38fcf581b0616562cd2da21fb8c50218 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Thu, 15 Dec 2011 00:21:15 -0800 Subject: Made the optimizer switch flags 'outer_join_with_cache', 'semijoin_with_cache' set to 'on' by default. --- mysql-test/t/join_outer.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test/t/join_outer.test') diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test index f88759c7b67..3bd5532ada0 100644 --- a/mysql-test/t/join_outer.test +++ b/mysql-test/t/join_outer.test @@ -8,6 +8,10 @@ drop table if exists t0,t1,t2,t3,t4,t5; --enable_warnings +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch=ifnull(@optimizer_switch_for_join_outer_test,'outer_join_with_cache=off'); + + CREATE TABLE t1 ( grp int(11) default NULL, a bigint(20) unsigned default NULL, @@ -1209,3 +1213,5 @@ DEALLOCATE PREPARE stmt; SET SESSION join_cache_level=default; DROP TABLE t1,t2,t3; + +SET optimizer_switch=@save_optimizer_switch; -- 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/join_outer.test | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mysql-test/t/join_outer.test') diff --git a/mysql-test/t/join_outer.test b/mysql-test/t/join_outer.test index 3bd5532ada0..04816402205 100644 --- a/mysql-test/t/join_outer.test +++ b/mysql-test/t/join_outer.test @@ -10,7 +10,14 @@ drop table if exists t0,t1,t2,t3,t4,t5; SET @save_optimizer_switch=@@optimizer_switch; SET optimizer_switch=ifnull(@optimizer_switch_for_join_outer_test,'outer_join_with_cache=off'); - +if (`select @join_cache_level_for_join_outer_test is null`) +{ + set join_cache_level=1; +} +if (`select @join_cache_level_for_join_outer_test is not null`) +{ + set join_cache_level=@join_cache_level_for_join_outer_test; +} CREATE TABLE t1 ( grp int(11) default NULL, -- cgit v1.2.1