diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-07 11:25:47 +0200 |
| commit | ab013df0806c83bf36d1ae4d4503ce8ff2caad84 (patch) | |
| tree | ca9a1a82215627b05504ef9b583eb2a3925fe1fa /sql/sql_test.cc | |
| parent | d4025ce1a60322635bf5f7adb765f4612563ee3a (diff) | |
| parent | b806eea262123165cd1209a58d8a9177d4bac3ed (diff) | |
| download | mariadb-git-ab013df0806c83bf36d1ae4d4503ce8ff2caad84.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
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 0bce4eb4a82..1a522b852e9 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -459,7 +459,7 @@ void mysql_print_status() VOID(my_getwd(current_dir, sizeof(current_dir),MYF(0))); printf("Current dir: %s\n", current_dir); printf("Running threads: %d Stack size: %ld\n", thread_count, - (long) thread_stack); + (long) my_thread_stack_size); thr_print_locks(); // Write some debug info #ifndef DBUG_OFF print_cached_tables(); @@ -536,7 +536,7 @@ Estimated memory (with thread stack): %ld\n", (int) info.uordblks, (int) info.fordblks, (int) info.keepcost, - (long) (thread_count * thread_stack + info.hblkhd + info.arena)); + (long) (thread_count * my_thread_stack_size + info.hblkhd + info.arena)); #endif Events::dump_internal_status(); |