diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-15 21:48:38 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-15 21:48:38 -0700 |
| commit | 078b59f5bcb2f4f5d45451a40b798cc92913f7fb (patch) | |
| tree | 3e1874756e544c0c0c4852ac5a6b3d5fe60b26bd /sql/mysqld.cc | |
| parent | a9d73e093aa68351fd6776a892012deffa27fb7d (diff) | |
| parent | ab411f8f1c2e84082623c038eb024c15c58745b5 (diff) | |
| download | mariadb-git-078b59f5bcb2f4f5d45451a40b798cc92913f7fb.tar.gz | |
Merge of mwl #106 into 5.3.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7db2eda0277..08794b6ab68 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -336,6 +336,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", + "derived_merge", "derived_with_keys", "firstmatch","loosescan","materialization","in_to_exists","semijoin", "partial_match_rowid_merge", "partial_match_table_scan", @@ -364,6 +365,8 @@ static const unsigned int optimizer_switch_names_len[]= sizeof("index_merge_intersection") - 1, sizeof("index_merge_sort_intersection") - 1, sizeof("index_condition_pushdown") - 1, + sizeof("derived_merge") - 1, + sizeof("derived_with_keys") - 1, sizeof("firstmatch") - 1, sizeof("loosescan") - 1, sizeof("materialization") - 1, @@ -483,6 +486,8 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," "index_merge_intersection=on," "index_merge_sort_intersection=off," "index_condition_pushdown=on," + "derived_merge=on," + "derived_with_keys=on," "firstmatch=on," "loosescan=on," "materialization=off," @@ -7543,8 +7548,9 @@ each time the SQL thread starts.", {"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_merge_sort_intersection, " - "index_condition_pushdown, firstmatch, loosescan, materialization, in_to_exists, " + "index_merge_sort_intersection, index_condition_pushdown, " + "derived_merge, derived_with_keys, " + "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, " |