Made the optimizer switch flags 'outer_join_with_cache', 'semijoin_with_cache'

set to 'on' by default.

1 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/t/subselect_cache.test
index 6bf5028b6cf..0abd20cc50e 100644
--- a/mysql-test/t/subselect_cache.test
+++ b/mysql-test/t/subselect_cache.test
@@ -4,6 +4,9 @@ drop table if exists t1,t2,t3,t4,t5;
 drop view if exists v1;
 --enable_warnings
 
+SET @save_optimizer_switch=@@optimizer_switch;
+SET optimizer_switch='outer_join_with_cache=off';
+SET optimizer_switch='semijoin_with_cache=off';
 
 set optimizer_switch='subquery_cache=on';
 
@@ -1698,5 +1701,7 @@ SELECT * FROM t4 WHERE b NOT IN ( SELECT * FROM v1 );
 drop view v1;
 drop table t1,t2,t3,t4;
 
+SET optimizer_switch=@save_optimizer_switch;
+
 --echo # restore default
 set @@optimizer_switch= default;