diff options
| author | unknown <pem@mysql.com> | 2004-05-14 16:10:31 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-05-14 16:10:31 +0200 |
| commit | 7edc2cf05dccd6f268fea6c63147e9151083023d (patch) | |
| tree | 8e542336390a9187dee0eb53fb3eff9a519c0752 /sql/set_var.cc | |
| parent | 3a272c1fa91121d3792a558840d2b764d758f4e9 (diff) | |
| parent | f3a16fef8f178b5edc47bec2c5f353495059edcf (diff) | |
| download | mariadb-git-7edc2cf05dccd6f268fea6c63147e9151083023d.tar.gz | |
Post-merge post-merge fix (new error codes for fparser).
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
libmysqld/Makefile.am:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/structs.h:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 079a0eae3dc..cac43836a8f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -160,6 +160,7 @@ sys_var_str sys_ft_boolean_syntax("ft_boolean_syntax", sys_update_ftb_syntax, sys_default_ftb_syntax, ft_boolean_syntax); +sys_var_thd_ulong sys_heuristic("heuristic", &SV::heuristic); sys_var_str sys_init_connect("init_connect", 0, sys_update_init_connect, sys_default_init_connect,0); @@ -262,6 +263,8 @@ sys_var_thd_ulong sys_net_retry_count("net_retry_count", 0, fix_net_retry_count); sys_var_thd_bool sys_new_mode("new", &SV::new_mode); sys_var_thd_bool sys_old_passwords("old_passwords", &SV::old_passwords); +sys_var_thd_ulong sys_plan_search_depth("plan_search_depth", + &SV::plan_search_depth); sys_var_thd_ulong sys_preload_buff_size("preload_buffer_size", &SV::preload_buff_size); sys_var_thd_ulong sys_read_buff_size("read_buffer_size", @@ -488,6 +491,7 @@ sys_var *sys_variables[]= &sys_ft_boolean_syntax, &sys_foreign_key_checks, &sys_group_concat_max_len, + &sys_heuristic, &sys_identity, &sys_init_connect, &sys_init_slave, @@ -536,6 +540,7 @@ sys_var *sys_variables[]= &sys_net_write_timeout, &sys_new_mode, &sys_old_passwords, + &sys_plan_search_depth, &sys_preload_buff_size, &sys_pseudo_thread_id, &sys_query_alloc_block_size, @@ -812,6 +817,8 @@ struct show_var_st init_vars[]= { {"version_compile_machine", (char*) MACHINE_TYPE, SHOW_CHAR}, {sys_os.name, (char*) &sys_os, SHOW_SYS}, {sys_net_wait_timeout.name, (char*) &sys_net_wait_timeout, SHOW_SYS}, + {sys_heuristic.name, (char*) &sys_heuristic, SHOW_SYS}, + {sys_plan_search_depth.name,(char*) &sys_plan_search_depth, SHOW_SYS}, {NullS, NullS, SHOW_LONG} }; |