diff options
author | monty@mashka.mysql.fi <> | 2003-10-16 03:08:40 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-10-16 03:08:40 +0300 |
commit | e87c9f5ff8e94ababbed0161101cfd3616d20422 (patch) | |
tree | bd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /sql/sql_test.cc | |
parent | 0d34e50f39e1b7cb14170dabc08f7823cb50a2e9 (diff) | |
parent | 4d45ad98b966cf26b8aaf888deed7d1c4c61fc84 (diff) | |
download | mariadb-git-e87c9f5ff8e94ababbed0161101cfd3616d20422.tar.gz |
merge with 4.0
Diffstat (limited to 'sql/sql_test.cc')
-rw-r--r-- | sql/sql_test.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 5a2b8ec86e5..112d42e4643 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -301,6 +301,8 @@ void mysql_print_status(THD *thd) printf("\nStatus information:\n\n"); 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); if (thd) thd->proc_info="locks"; thr_print_locks(); // Write some debug info @@ -379,8 +381,9 @@ Maximum total allocated space: %d\n\ Space available in freed fastbin blocks: %d\n\ Total allocated space: %d\n\ Total free space: %d\n\ -Top-most, releasable space: %d\n", - (int) info.arena, +Top-most, releasable space: %d\n\ +Estimated memory (with thread stack): %ld\n", + (int) info.arena , (int) info.ordblks, (int) info.smblks, (int) info.hblks, @@ -389,7 +392,8 @@ Top-most, releasable space: %d\n", (int) info.fsmblks, (int) info.uordblks, (int) info.fordblks, - (int) info.keepcost); + (int) info.keepcost, + (long) (thread_count * thread_stack + info.hblkhd + info.arena)); #endif puts(""); if (thd) |