From 3cc64cef9ac515de6398bf37cdb60ed5e36587bb Mon Sep 17 00:00:00 2001 From: "iggy@mysql.com" <> Date: Wed, 24 May 2006 09:34:36 -0400 Subject: [PATCH] BUG#18669: Session COM_STATISTICS breaks mysqladmin status. Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens. --- sql/sql_parse.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a8de7ff0154..a3e4db6d1ab 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1992,13 +1992,17 @@ bool dispatch_command(enum enum_server_command command, THD *thd, #else char *buff= thd->net.last_error; #endif + + STATUS_VAR current_global_status_var; + calc_sum_of_all_status(¤t_global_status_var); + ulong uptime = (ulong) (thd->start_time - start_time); 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, (int) thread_count, (ulong) thd->query_id, - (ulong) thd->status_var.long_query_count, - thd->status_var.opened_tables, refresh_version, cached_tables(), + current_global_status_var.long_query_count, + current_global_status_var.opened_tables, refresh_version, cached_tables(), (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) : (double) 0)); #ifdef SAFEMALLOC