summaryrefslogtreecommitdiff
path: root/mysql-test/main/join_outer_jcl6.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/join_outer_jcl6.test')
-rw-r--r--mysql-test/main/join_outer_jcl6.test16
1 files changed, 4 insertions, 12 deletions
diff --git a/mysql-test/main/join_outer_jcl6.test b/mysql-test/main/join_outer_jcl6.test
index 9db06c783bd..46839cb1065 100644
--- a/mysql-test/main/join_outer_jcl6.test
+++ b/mysql-test/main/join_outer_jcl6.test
@@ -2,23 +2,15 @@
# Run join_outer.test with BKA enabled
#
-set @save_optimizer_switch_jcl6=@@optimizer_switch;
+--source include/default_optimizer_switch.inc
+
set @@optimizer_switch='optimize_join_buffer_size=on';
set @@optimizer_switch='semijoin_with_cache=on';
set @@optimizer_switch='outer_join_with_cache=on';
-set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
-
-set join_cache_level=6;
-show variables like 'join_cache_level';
+set @@optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+set @@join_cache_level=6;
set @optimizer_switch_for_join_outer_test=@@optimizer_switch;
set @join_cache_level_for_join_outer_test=@@join_cache_level;
--source join_outer.test
-
-set join_cache_level=default;
-show variables like 'join_cache_level';
-
-set @@optimizer_switch=@save_optimizer_switch_jcl6;
-set @optimizer_switch_for_join_outer_test=NULL;
-set @join_cache_level_for_join_outer_test=NULL;