diff options
| author | unknown <timour@askmonty.org> | 2011-03-01 14:16:28 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2011-03-01 14:16:28 +0200 |
| commit | 7895c35874c76a88d7b1be609f06fbe6f266aab7 (patch) | |
| tree | a1f57cf7c7bb129bb67d0aed5176d0bcaf4b7920 /sql/mysqld.cc | |
| parent | 39616eb9ef974c69e73bcb80cd7e3c40228910fd (diff) | |
| parent | 759d71eba1842bbde7b44fc42e1098590b136320 (diff) | |
| download | mariadb-git-7895c35874c76a88d7b1be609f06fbe6f266aab7.tar.gz | |
MWL#89
Merge MWL#89 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 b0247b1d48b..7580f64417a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -341,7 +341,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", @@ -370,6 +370,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, @@ -476,7 +477,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," @@ -7410,7 +7412,7 @@ thread is in the relay logs.", "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" |