diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-26 12:32:27 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-26 12:32:27 +0200 |
| commit | 3a5a7ef44c600ab6265821945ce3ca53a5801270 (patch) | |
| tree | a72c3901c825aed1f51438938c9bd29cec582699 /sql/set_var.cc | |
| parent | 2daa01682775d42bbe00d3fb41e0865079240de8 (diff) | |
| parent | 6ef32fd0a91148b9758acaa1e2ebde3110e96781 (diff) | |
| download | mariadb-git-3a5a7ef44c600ab6265821945ce3ca53a5801270.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
mysql-test/lib/mtr_report.pl:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 46a64b1a87c..99931d7bafc 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -810,7 +810,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}, }; |