diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-07-22 23:47:28 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-07-22 23:47:28 -0700 |
| commit | 668eb2b55ed2cefeb79e196ba48565a75f485f15 (patch) | |
| tree | d042decca87b2c0f3545b49b7c752b25ff7402e4 /mysql-test/include/ps_query.inc | |
| parent | d117f51901adc011d6d655216ec19ee0559e6acf (diff) | |
| download | mariadb-git-668eb2b55ed2cefeb79e196ba48565a75f485f15.tar.gz | |
Removed settings of 'derived_merge' to 'on' in ps tests.
Diffstat (limited to 'mysql-test/include/ps_query.inc')
| -rw-r--r-- | mysql-test/include/ps_query.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index eafe651a2e7..8148935cbe1 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -528,8 +528,6 @@ 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 @@ -598,7 +596,6 @@ 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 |