Change the default @@optimizer_switch setting from

  semijoin=on,firstmatch=on,loosescan=on
to
  semijoin=off,firstmatch=off,loosescan=off
Adjust the testcases:
- Modify subselect*.test and join_cache.test so that all tests
  use the same execution paths as before (i.e. optimizations that
  are being tested are enabled)
- Let all other test files run with the new default settings (i.e.
  with new optimizations disabled)
- Copy subquery testcases from these files into t/subselect_extra.test
  which will run them with new optimizations enabled.

1 files changed, 4 insertions, 1 deletions

diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test
index 0c12cfd4be0..46c8306e144 100644
--- a/mysql-test/t/subselect_sj.test
+++ b/mysql-test/t/subselect_sj.test
@@ -7,6 +7,9 @@ drop view if exists v1, v2;
 drop procedure if exists p1;
 --enable_warnings
 
+set @subselect_sj_tmp= @@optimizer_switch;
+set optimizer_switch='semijoin=on,firstmatch=on,loosescan=on';
+# The 'default' value within the scope of this test:
 set @save_optimizer_switch=@@optimizer_switch;
 
 #
@@ -1396,4 +1399,4 @@ DROP TABLE t1, t2;
 set optimizer_switch=@save_802965;
 
 # The following command must be the last one the file 
-set @@optimizer_switch=@save_optimizer_switch;
+set optimizer_switch=@subselect_sj_tmp;