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/r/join_outer_jcl6.result | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mysql-test/r/join_outer_jcl6.result') diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result index 11b5edf5a13..ec6e773fbae 100644 --- a/mysql-test/r/join_outer_jcl6.result +++ b/mysql-test/r/join_outer_jcl6.result @@ -7,7 +7,10 @@ set join_cache_level=6; show variables like 'join_cache_level'; Variable_name Value join_cache_level 6 +set @optimizer_switch_for_join_outer_test=@@optimizer_switch; 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'); CREATE TABLE t1 ( grp int(11) default NULL, a bigint(20) unsigned default NULL, @@ -1659,8 +1662,10 @@ b b a b DEALLOCATE PREPARE stmt; SET SESSION join_cache_level=default; DROP TABLE t1,t2,t3; +SET optimizer_switch=@save_optimizer_switch; set join_cache_level=default; show variables like 'join_cache_level'; Variable_name Value join_cache_level 1 set @@optimizer_switch=@save_optimizer_switch_jcl6; +set @optimizer_switch_for_join_outer_test=NULL; -- 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/r/join_outer_jcl6.result | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mysql-test/r/join_outer_jcl6.result') diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result index ec6e773fbae..ab9e437c6bf 100644 --- a/mysql-test/r/join_outer_jcl6.result +++ b/mysql-test/r/join_outer_jcl6.result @@ -8,9 +8,11 @@ show variables like 'join_cache_level'; Variable_name Value join_cache_level 6 set @optimizer_switch_for_join_outer_test=@@optimizer_switch; +set @join_cache_level_for_join_outer_test=@@join_cache_level; 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'); +set join_cache_level=@join_cache_level_for_join_outer_test; CREATE TABLE t1 ( grp int(11) default NULL, a bigint(20) unsigned default NULL, @@ -1666,6 +1668,7 @@ SET optimizer_switch=@save_optimizer_switch; set join_cache_level=default; show variables like 'join_cache_level'; Variable_name Value -join_cache_level 1 +join_cache_level 2 set @@optimizer_switch=@save_optimizer_switch_jcl6; set @optimizer_switch_for_join_outer_test=NULL; +set @join_cache_level_for_join_outer_test=NULL; -- cgit v1.2.1