summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt/r
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-07-22 21:39:55 -0700
committerIgor Babaev <igor@askmonty.org>2011-07-22 21:39:55 -0700
commitd117f51901adc011d6d655216ec19ee0559e6acf (patch)
tree27966c23b482817f4115fded3057b2f4b39f3e92 /mysql-test/suite/pbxt/r
parent2092436457414f93061715dc7b45dbbe28f1e111 (diff)
downloadmariadb-git-d117f51901adc011d6d655216ec19ee0559e6acf.tar.gz
Fixed a crash with pbxt.subselect when 'derived_merge' is set off in
the optimizer switch.
Diffstat (limited to 'mysql-test/suite/pbxt/r')
-rw-r--r--mysql-test/suite/pbxt/r/subselect.result3
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/suite/pbxt/r/subselect.result b/mysql-test/suite/pbxt/r/subselect.result
index f2a5def6336..b5aa8317180 100644
--- a/mysql-test/suite/pbxt/r/subselect.result
+++ b/mysql-test/suite/pbxt/r/subselect.result
@@ -2627,8 +2627,6 @@ createDate datetime NOT NULL,
modifyDate timestamp NOT NULL
);
INSERT INTO t5 VALUES (5141,12,'2004-08-06','2004-08-06');
-set @save_optimizer_switch=@@optimizer_switch;
-set optimizer_switch='derived_merge=on';
select
count(distinct t2.userid) pass,
groupstuff.*,
@@ -2670,7 +2668,6 @@ pass userid parentid parentgroup childid groupname grouptypeid crse categoryid c
1 5141 12 group2 12 group2 5 1 1 87 Oct04
1 5141 12 group2 12 group2 5 1 2 88 Oct04
1 5141 12 group2 12 group2 5 1 2 89 Oct04
-set optimizer_switch=@save_optimizer_switch;
drop table t1, t2, t3, t4, t5;
create table t1 (a int);
insert into t1 values (1), (2), (3);