summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2006-10-13 11:43:33 +0200
committerunknown <serg@janus.mylan>2006-10-13 11:43:33 +0200
commit67a2b7cf298d0a351256ab13c2577c32e20bd723 (patch)
treeba0eb1eef3749ba0752df03beef0f6f83cde973c /sql/set_var.cc
parent0a1dc8af5b665647a08c51f75b5d5c2e1a112d99 (diff)
parentc2872bafde6d6ec2444c293f7a8aa397eb1dbb59 (diff)
downloadmariadb-git-67a2b7cf298d0a351256ab13c2577c32e20bd723.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria configure.in: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_test.cc: Auto merged storage/maria/Makefile.am: Auto merged storage/maria/ha_maria.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged unittest/Makefile.am: Auto merged unittest/mysys/my_atomic-t.c: merged
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index c41f3afae60..ff02a1d24b1 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1054,10 +1054,10 @@ SHOW_VAR init_vars[]= {
#ifdef HAVE_THR_SETCONCURRENCY
{"thread_concurrency", (char*) &concurrency, SHOW_LONG},
#endif
- {"thread_stack", (char*) &thread_stack, SHOW_LONG},
+ {"thread_stack", (char*) &my_thread_stack_size, SHOW_LONG},
{sys_time_format.name, (char*) &sys_time_format, SHOW_SYS},
{"time_zone", (char*) &sys_time_zone, SHOW_SYS},
- {sys_timed_mutexes.name, (char*) &sys_timed_mutexes, SHOW_SYS},
+ {sys_timed_mutexes.name, (char*) &sys_timed_mutexes, SHOW_SYS},
{sys_tmp_table_size.name, (char*) &sys_tmp_table_size, SHOW_SYS},
{sys_tmpdir.name, (char*) &sys_tmpdir, SHOW_SYS},
{sys_trans_alloc_block_size.name, (char*) &sys_trans_alloc_block_size,