summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect3_jcl6.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-12-15 14:28:34 -0800
committerIgor Babaev <igor@askmonty.org>2011-12-15 14:28:34 -0800
commit43d9fc32046b1b7ca1a49395f9dd79c145dba215 (patch)
treed7ce39b77531abd73a07204a908b5fb8d3133b15 /mysql-test/r/subselect3_jcl6.result
parent876f16afbb038992bc984960821d8bb8a830cc6f (diff)
parenta910e8ef5b5d33cd600acaba9ec3cc8c49881196 (diff)
downloadmariadb-git-43d9fc32046b1b7ca1a49395f9dd79c145dba215.tar.gz
Merge.
Diffstat (limited to 'mysql-test/r/subselect3_jcl6.result')
-rw-r--r--mysql-test/r/subselect3_jcl6.result5
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/r/subselect3_jcl6.result
index 5ad5878623d..a0153cf209d 100644
--- a/mysql-test/r/subselect3_jcl6.result
+++ b/mysql-test/r/subselect3_jcl6.result
@@ -7,9 +7,11 @@ set join_cache_level=6;
show variables like 'join_cache_level';
Variable_name Value
join_cache_level 6
+set @join_cache_level_for_subselect3_test=@@join_cache_level;
drop table if exists t0, t1, t2, t3, t4, t5, t11, t12, t21, t22;
set @subselect3_tmp= @@optimizer_switch;
set optimizer_switch='semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on';
+set join_cache_level=@join_cache_level_for_subselect3_test;
create table t1 (oref int, grp int, ie int) ;
insert into t1 (oref, grp, ie) values
(1, 1, 1),
@@ -1502,5 +1504,6 @@ set @@optimizer_switch=@subselect3_tmp;
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;
+set @join_cache_level_for_subselect3_test=NULL;