Removed settings of 'derived_merge' to 'on' in ps tests.

mysql-test/include/ps_query.inc

@@ -528,8 +528,6 @@ drop table t5, t6, t7 ;
 --disable_warnings
 drop table if exists t2 ;
 --enable_warnings
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 ## unusual and complex SELECT without parameters
 set @stmt= ' SELECT
@@ -598,7 +596,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
                     @arg07, @arg08, @arg09 ;
 --enable_result_log
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch; 
 
 ##### test case derived from client_test.c: test_bug4079()
 --error 1242

mysql-test/r/ps_2myisam.result

@@ -902,8 +902,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -953,7 +951,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;

mysql-test/r/ps_3innodb.result

@@ -902,8 +902,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -953,7 +951,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;

mysql-test/r/ps_4heap.result

@@ -903,8 +903,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -954,7 +952,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;

mysql-test/r/ps_5merge.result

@@ -945,8 +945,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -996,7 +994,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;
@@ -4302,8 +4299,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -4353,7 +4348,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;

mysql-test/suite/maria/r/ps_maria.result

@@ -902,8 +902,6 @@ a	(select count(distinct t5.b) as sum from t5, t6
 1	2
 drop table t5, t6, t7 ;
 drop table if exists t2 ;
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
 create table t2 as select * from t9;
 set @stmt= ' SELECT
    (SELECT SUM(c1 + c12 + 0.0) FROM t2 
@@ -953,7 +951,6 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06,
 @arg07, @arg08, @arg09 ;
 drop table t2 ;
-set optimizer_switch=@save_optimizer_switch;
 select 1 < (select a from t1) ;
 ERROR 21000: Subquery returns more than 1 row
 prepare stmt1 from ' select 1 < (select a from t1) ' ;