diff options
author | Igor Babaev <igor@askmonty.org> | 2011-07-21 14:23:08 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2011-07-21 14:23:08 -0700 |
commit | 63abf00a62313107884f0b304d2c53de73f4eacd (patch) | |
tree | 664adb16a62a9b6b72b52c786c9c98d021158243 /mysql-test/suite/vcol | |
parent | 99cce18955dfb43d7d69c7de704cb29f047f8da5 (diff) | |
download | mariadb-git-63abf00a62313107884f0b304d2c53de73f4eacd.tar.gz |
Made the optimizer switches 'derived_merge' and 'derived_with_keys'
off by default.
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r-- | mysql-test/suite/vcol/r/vcol_select_innodb.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/vcol/r/vcol_select_myisam.result | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_select_innodb.result b/mysql-test/suite/vcol/r/vcol_select_innodb.result index 7f7b1e40269..3e6a95caef1 100644 --- a/mysql-test/suite/vcol/r/vcol_select_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_select_innodb.result @@ -98,7 +98,8 @@ a b c NULL NULL NULL explain select * from (select a,b,c from t1) as t11; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 5 +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 5 +2 DERIVED t1 ALL NULL NULL NULL NULL 5 ### ### Using aggregate functions with/without DISTINCT ### diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result index cc327a818b4..657b79dc582 100644 --- a/mysql-test/suite/vcol/r/vcol_select_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result @@ -98,7 +98,8 @@ a b c NULL NULL NULL explain select * from (select a,b,c from t1) as t11; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL NULL NULL NULL NULL 5 +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 5 +2 DERIVED t1 ALL NULL NULL NULL NULL 5 ### ### Using aggregate functions with/without DISTINCT ### |