summaryrefslogtreecommitdiff
path: root/mysql-test/main/subselect3_jcl6.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 14:06:56 +0300
committerMonty <monty@mariadb.org>2019-09-03 13:17:32 +0300
commita071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch)
treeb592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/subselect3_jcl6.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/subselect3_jcl6.test')
-rw-r--r--mysql-test/main/subselect3_jcl6.test15
1 files changed, 4 insertions, 11 deletions
diff --git a/mysql-test/main/subselect3_jcl6.test b/mysql-test/main/subselect3_jcl6.test
index 6cbbf10cc2f..e367866733d 100644
--- a/mysql-test/main/subselect3_jcl6.test
+++ b/mysql-test/main/subselect3_jcl6.test
@@ -2,21 +2,14 @@
# Run subselect3.test with BKA enabled
#
-set @save_optimizer_switch=@@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 @join_cache_level_for_subselect3_test=@@join_cache_level;
-
---source subselect3.test
-set join_cache_level=default;
-show variables like 'join_cache_level';
+--source subselect3.inc
-set @@optimizer_switch=@save_optimizer_switch;
-set @join_cache_level_for_subselect3_test=NULL;
+--echo # end of 10.2 test