summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_4heap.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-07-21 14:23:08 -0700
committerIgor Babaev <igor@askmonty.org>2011-07-21 14:23:08 -0700
commit63abf00a62313107884f0b304d2c53de73f4eacd (patch)
tree664adb16a62a9b6b72b52c786c9c98d021158243 /mysql-test/r/ps_4heap.result
parent99cce18955dfb43d7d69c7de704cb29f047f8da5 (diff)
downloadmariadb-git-63abf00a62313107884f0b304d2c53de73f4eacd.tar.gz
Made the optimizer switches 'derived_merge' and 'derived_with_keys'
off by default.
Diffstat (limited to 'mysql-test/r/ps_4heap.result')
-rw-r--r--mysql-test/r/ps_4heap.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 58acc19124a..91be8c59493 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -903,6 +903,8 @@ 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
@@ -952,6 +954,7 @@ 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) ' ;