diff options
| author | unknown <jani@hynda.mysql.fi> | 2008-02-27 16:46:32 +0200 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2008-02-27 16:46:32 +0200 |
| commit | bfbea4f4b40948621213aad712781b64cc80186f (patch) | |
| tree | 62bd6b18ff3b4c12d2ed3f7e4b77b8f6ee45be4f /sql/set_var.cc | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | e265b62b52c4fc4c1fbc0724bf4538ddaaf59a35 (diff) | |
| download | mariadb-git-bfbea4f4b40948621213aad712781b64cc80186f.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisampack.c:
Auto merged
sql/mysqld.cc:
Manual merge with main 5.1 tree.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 972b92e0b33..77c57ed46b4 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -742,7 +742,7 @@ static SHOW_VAR fixed_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}, }; |