diff options
| author | unknown <iggy@mysql.com> | 2006-05-30 08:22:12 -0400 |
|---|---|---|
| committer | unknown <iggy@mysql.com> | 2006-05-30 08:22:12 -0400 |
| commit | e066cb33b2a0fdb8381d01decad7bc1e0aa76caa (patch) | |
| tree | 2bdc52ed4dd991b5ce4ff1afe3cc48aae36346b1 /sql | |
| parent | 83063c5034a30e1acc61e116e4c33a6cfd80439d (diff) | |
| parent | 5aa3446217154933409dc3398d9f67bc0e64a98e (diff) | |
| download | mariadb-git-e066cb33b2a0fdb8381d01decad7bc1e0aa76caa.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/mnt/storeage/mysql-5.0-maint_bug18669
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 37e45e999b3..213a7730824 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 |