diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-02-23 19:16:48 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-02-23 19:16:48 +0300 |
| commit | cb6581d89459a4c45e9146a40e1f0119a2e8e325 (patch) | |
| tree | 3d3b5469190266610021c7ceae3e2beb730355fe /sql/sql_class.h | |
| parent | fecaef26af0417a23f6585c79de41abd5f6aba86 (diff) | |
| download | mariadb-git-cb6581d89459a4c45e9146a40e1f0119a2e8e325.tar.gz | |
- Backport @@optimizer_switch support from 6.0
- Add support for setting it as a server commandline argument
- Add support for those switches:
= no_index_merge
= no_index_merge_union
= no_index_merge_sort_union
= no_index_merge_intersection
mysql-test/r/index_merge_myisam.result:
Testcases for index_merge related @@optimizer_switch flags.
mysql-test/t/index_merge_myisam.test:
Testcases for index_merge related @@optimizer_switch flags.
sql/set_var.cc:
- Backport @@optimizer_switch support from 6.0
- Add support for setting it as a server commandline argument
sql/sql_class.h:
- Backport @@optimizer_switch support from 6.0
sql/sql_select.h:
- Backport @@optimizer_switch support from 6.0
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3439e5b4f74..dd285eb0645 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -321,6 +321,8 @@ struct system_variables ulong net_write_timeout; ulong optimizer_prune_level; ulong optimizer_search_depth; + /* A bitmap for switching optimizations on/off */ + ulong optimizer_switch; ulong preload_buff_size; ulong profiling_history_size; ulong query_cache_type; |