summaryrefslogtreecommitdiff
path: root/mysql-test/include/ps_query.inc
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/include/ps_query.inc
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/include/ps_query.inc')
-rw-r--r--mysql-test/include/ps_query.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc
index ae6027a0e07..eafe651a2e7 100644
--- a/mysql-test/include/ps_query.inc
+++ b/mysql-test/include/ps_query.inc
@@ -528,6 +528,8 @@ 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
@@ -596,7 +598,7 @@ 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