diff options
author | Igor Babaev <igor@askmonty.org> | 2011-11-26 14:23:00 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2011-11-26 14:23:00 -0800 |
commit | 17b4e4a194ea513f776bab5010d88d24a51b9d9e (patch) | |
tree | ffe20f58c4b68af894ebedf30cb3dba679300a66 /mysql-test/r/derived.result | |
parent | d84ea521c539e4f63511f1787df4b4dcb12886d1 (diff) | |
download | mariadb-git-17b4e4a194ea513f776bab5010d88d24a51b9d9e.tar.gz |
Set new default values for the optimizer switch flags 'derived_merge'
and 'derived_with_keys'. Now they are set on by default.
Diffstat (limited to 'mysql-test/r/derived.result')
-rw-r--r-- | mysql-test/r/derived.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index cb84d10e0fa..f34810ada6a 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -1,4 +1,6 @@ drop table if exists t1,t2,t3; +set @save_derived_optimizer_switch=@@optimizer_switch; +set optimizer_switch='derived_merge=off,derived_with_keys=off'; select * from (select 2 from DUAL) b; 2 2 @@ -205,6 +207,7 @@ x 1 create user mysqltest_1; create table t1 select 1 as a; +set optimizer_switch='derived_merge=off,derived_with_keys=off'; select 2 as a from (select * from t1) b; ERROR 3D000: No database selected use test; @@ -413,3 +416,4 @@ MIN(i) 1 DROP TABLE t1; # End of 5.0 tests +set optimizer_switch=@save_derived_optimizer_switch; |