diff options
| author | unknown <timour@askmonty.org> | 2011-05-10 18:28:05 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-05-10 18:28:05 +0300 |
| commit | a55b1165d2d1bb5711e34649723fcd448672e4d9 (patch) | |
| tree | 4feae76840ced52c3acc4657ac15a40015f040fa /sql/mysqld.cc | |
| parent | e843297d128b165125d17aab8958f7ca91808923 (diff) | |
| parent | ee3b7b56e4b854a777d14ba4b26cd457a1aba482 (diff) | |
| download | mariadb-git-a55b1165d2d1bb5711e34649723fcd448672e4d9.tar.gz | |
MWL#89 - Automatic merge with 5.3
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2e4ce2c6be6..9c5765467c1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -335,7 +335,7 @@ static const char *optimizer_switch_names[]= "index_merge","index_merge_union","index_merge_sort_union", "index_merge_intersection","index_merge_sort_intersection", "index_condition_pushdown", - "firstmatch","loosescan","materialization", "semijoin", + "firstmatch","loosescan","materialization","in_to_exists","semijoin", "partial_match_rowid_merge", "partial_match_table_scan", "subquery_cache", @@ -364,6 +364,7 @@ static const unsigned int optimizer_switch_names_len[]= sizeof("firstmatch") - 1, sizeof("loosescan") - 1, sizeof("materialization") - 1, + sizeof("in_to_exists") - 1, sizeof("semijoin") - 1, sizeof("partial_match_rowid_merge") - 1, sizeof("partial_match_table_scan") - 1, @@ -470,7 +471,8 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," "index_condition_pushdown=on," "firstmatch=on," "loosescan=on," - "materialization=on," + "materialization=off," + "in_to_exists=on," "semijoin=on," "partial_match_rowid_merge=on," "partial_match_table_scan=on," @@ -7462,7 +7464,7 @@ each time the SQL thread starts.", "optimizer_switch=option=val[,option=val...], where option={index_merge, " "index_merge_union, index_merge_sort_union, index_merge_intersection, " "index_merge_sort_intersection, " - "index_condition_pushdown, firstmatch, loosescan, materialization, " + "index_condition_pushdown, firstmatch, loosescan, materialization, in_to_exists, " "semijoin, partial_match_rowid_merge, partial_match_table_scan, " "subquery_cache, outer_join_with_cache, semijoin_with_cache, " "join_cache_incremental, join_cache_hashed, join_cache_bka, " |