From 668eb2b55ed2cefeb79e196ba48565a75f485f15 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Fri, 22 Jul 2011 23:47:28 -0700 Subject: Removed settings of 'derived_merge' to 'on' in ps tests. --- mysql-test/r/ps_4heap.result | 3 --- 1 file changed, 3 deletions(-) (limited to 'mysql-test/r/ps_4heap.result') diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 91be8c59493..58acc19124a 100644 --- a/mysql-test/r/ps_4heap.result +++ b/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) ' ; -- cgit v1.2.1