1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Igor Babaev 2011-07-22 23:47:28 -07:00
parent d117f51901
commit 668eb2b55e
6 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/ps_query.inc
View File

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

3
mysql-test/r/ps_2myisam.result
View File

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

3
mysql-test/r/ps_3innodb.result
View File

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

3
mysql-test/r/ps_4heap.result
View File

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

6
mysql-test/r/ps_5merge.result
View File

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

3
mysql-test/suite/maria/r/ps_maria.result
View File

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