summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2010-09-09 11:01:13 +0300
committerunknown <sanja@askmonty.org>2010-09-09 11:01:13 +0300
commitaec06c992be12004a94ef3f806e699519306062a (patch)
tree5a572e80f0ee6ab50d05237c5b773af3b2f944b1
parent11dc256ca4ee1057d1e918326b8c76fdbbca63cd (diff)
downloadmariadb-git-aec06c992be12004a94ef3f806e699519306062a.tar.gz
table_elimination switchable only for debug build and has no influence on the result of the test so it is removed.
-rw-r--r--mysql-test/r/subselect_cache.result2
-rw-r--r--mysql-test/t/subselect_cache.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/r/subselect_cache.result
index 71c4a4bc88c..374bb44e5c5 100644
--- a/mysql-test/r/subselect_cache.result
+++ b/mysql-test/r/subselect_cache.result
@@ -3199,7 +3199,7 @@ Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where <expr_cache><`tes
drop table t1,t2;
set @@optimizer_switch= default;
# LP BUG#615760 (part 2: incorrect heap table index flags)
-SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on,table_elimination=off';
+SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on';
CREATE TABLE `t1` (
`pk` int(11) NOT NULL AUTO_INCREMENT,
`col_int_nokey` int(11) DEFAULT NULL,
diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/t/subselect_cache.test
index 5340f5ead54..32099c51003 100644
--- a/mysql-test/t/subselect_cache.test
+++ b/mysql-test/t/subselect_cache.test
@@ -1489,7 +1489,7 @@ set @@optimizer_switch= default;
#
--echo # LP BUG#615760 (part 2: incorrect heap table index flags)
#
-SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on,table_elimination=off';
+SET SESSION optimizer_switch = 'index_merge=off,index_merge_union=off,index_merge_sort_union=off,index_merge_intersection=off,index_condition_pushdown=off,firstmatch=off,loosescan=off,materialization=off,semijoin=off,partial_match_rowid_merge=off,partial_match_table_scan=off,subquery_cache=on';
CREATE TABLE `t1` (
`pk` int(11) NOT NULL AUTO_INCREMENT,