summaryrefslogtreecommitdiff
path: root/mysql-test/r/optimizer_switch.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-29 18:14:03 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-29 18:14:03 -0800
commit77cbad4b31160aab28903c7852424c24dab3eec9 (patch)
treed9f9def3bec0b2f16e4250677f411c4b8ed12253 /mysql-test/r/optimizer_switch.result
parenta2a09f06bf151ca7637f867d904fd6604b5fd216 (diff)
downloadmariadb-git-77cbad4b31160aab28903c7852424c24dab3eec9.tar.gz
Corrected the test case for bug 695304.
Added a test case for bug #695442 - a duplicate of bug 694092.
Diffstat (limited to 'mysql-test/r/optimizer_switch.result')
-rw-r--r--mysql-test/r/optimizer_switch.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/optimizer_switch.result b/mysql-test/r/optimizer_switch.result
index b9833c118bc..45595b4989c 100644
--- a/mysql-test/r/optimizer_switch.result
+++ b/mysql-test/r/optimizer_switch.result
@@ -99,4 +99,4 @@ index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_inters
set optimizer_switch=default;
select @@optimizer_switch;
@@optimizer_switch
-index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on,table_elimination=on
+index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,index_merge_sort_intersection=off,index_condition_pushdown=on,firstmatch=on,loosescan=on,materialization=on,semijoin=on,partial_match_rowid_merge=on,partial_match_table_scan=on,subquery_cache=on,mrr_sort_keys=on,outer_join_with_cache=off,semijoin_with_cache=off,join_cache_incremental=on,join_cache_hashed=on,join_cache_bka=on