summaryrefslogtreecommitdiff
path: root/mysql-test/t/subselect_sj.test
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-12-15 15:55:00 -0800
committerIgor Babaev <igor@askmonty.org>2011-12-15 15:55:00 -0800
commit919f19110fbcfb4326559f48f7ba9fa5c35d904d (patch)
tree38024bb9d1d77ac6bc3a1589ce1e1a52ece5f771 /mysql-test/t/subselect_sj.test
parent4dd456c220f702aeb0c9c32a52d7fe5c05ddca14 (diff)
parent43d9fc32046b1b7ca1a49395f9dd79c145dba215 (diff)
downloadmariadb-git-919f19110fbcfb4326559f48f7ba9fa5c35d904d.tar.gz
Merge
Diffstat (limited to 'mysql-test/t/subselect_sj.test')
-rw-r--r--mysql-test/t/subselect_sj.test11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test
index 55074787700..2b64de47439 100644
--- a/mysql-test/t/subselect_sj.test
+++ b/mysql-test/t/subselect_sj.test
@@ -10,6 +10,17 @@ drop procedure if exists p1;
set @subselect_sj_tmp= @@optimizer_switch;
set optimizer_switch='semijoin=on,firstmatch=on,loosescan=on';
set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+SET optimizer_switch=ifnull(@optimizer_switch_for_subselect_sj_test,'outer_join_with_cache=off');
+SET optimizer_switch=ifnull(@optimizer_switch_for_subselect_sj_test,'semijoin_with_cache=off');
+if (`select @join_cache_level_for_subselect_sj_test is null`)
+{
+ set join_cache_level=1;
+}
+if (`select @join_cache_level_for_subselect_sj_test is not null`)
+{
+ set join_cache_level=@join_cache_level_for_subselect_sj_test;
+}
+
# The 'default' value within the scope of this test:
set @save_optimizer_switch=@@optimizer_switch;