diff options
| author | unknown <timour@askmonty.org> | 2010-12-03 15:37:54 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2010-12-03 15:37:54 +0200 |
| commit | be95cde85991f4d4149d6532801720e583257642 (patch) | |
| tree | 3a776a23ab79ba041809b6cf9fd813925bf8b24f /sql/mysqld.cc | |
| parent | ab5e4eefd5d25c6e0755c2460dbb433a7a9e913b (diff) | |
| parent | 1b3336dc30cf97283cca6071f089df992c425eb2 (diff) | |
| download | mariadb-git-be95cde85991f4d4149d6532801720e583257642.tar.gz | |
Merge 5.3-mwl89 into 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 83b64621786..d04830e11e0 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_condition_pushdown", - "firstmatch","loosescan","materialization", "semijoin", + "firstmatch","loosescan","materialization","in_to_exists","semijoin", "partial_match_rowid_merge", "partial_match_table_scan", "subquery_cache", @@ -362,6 +362,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, @@ -460,7 +461,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," @@ -7379,7 +7381,7 @@ thread is in the relay logs.", {"optimizer_switch", OPT_OPTIMIZER_SWITCH, "optimizer_switch=option=val[,option=val...], where option={index_merge, " "index_merge_union, index_merge_sort_union, index_merge_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" #ifndef DBUG_OFF |