Commit 433c57d9 authored by iggy@mysql.com's avatar iggy@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  mysql.com:/mnt/storeage/mysql-5.0-maint_bug18669
parents 076ddbf8 3cc64cef
...@@ -1992,13 +1992,17 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1992,13 +1992,17 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
#else #else
char *buff= thd->net.last_error; char *buff= thd->net.last_error;
#endif #endif
STATUS_VAR current_global_status_var;
calc_sum_of_all_status(&current_global_status_var);
ulong uptime = (ulong) (thd->start_time - start_time); ulong uptime = (ulong) (thd->start_time - start_time);
sprintf((char*) buff, sprintf((char*) buff,
"Uptime: %lu Threads: %d Questions: %lu Slow queries: %lu Opens: %lu Flush tables: %lu Open tables: %u Queries per second avg: %.3f", "Uptime: %lu Threads: %d Questions: %lu Slow queries: %lu Opens: %lu Flush tables: %lu Open tables: %u Queries per second avg: %.3f",
uptime, uptime,
(int) thread_count, (ulong) thd->query_id, (int) thread_count, (ulong) thd->query_id,
(ulong) thd->status_var.long_query_count, current_global_status_var.long_query_count,
thd->status_var.opened_tables, refresh_version, cached_tables(), current_global_status_var.opened_tables, refresh_version, cached_tables(),
(uptime ? (ulonglong2double(thd->query_id) / (double) uptime) : (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) :
(double) 0)); (double) 0));
#ifdef SAFEMALLOC #ifdef SAFEMALLOC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment