summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorSergey Petrunia <sergefp@mysql.com>2009-02-23 19:16:48 +0300
committerSergey Petrunia <sergefp@mysql.com>2009-02-23 19:16:48 +0300
commite08a5318d522b557a906284600bd4434098d2b93 (patch)
tree3d3b5469190266610021c7ceae3e2beb730355fe /sql/sql_class.h
parentfc43a137d4138ec50a64fa3e616ba4eb23b7ea37 (diff)
downloadmariadb-git-e08a5318d522b557a906284600bd4434098d2b93.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
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
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;