diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-04-05 23:20:09 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-04-05 23:20:09 +0300 |
| commit | 08d51d05dc4373754ccaba6c958966bff525c552 (patch) | |
| tree | fa5088ce646b5e29a0db93d39246dc05efcdcb14 | |
| parent | 127afff8c87cf8d6a56de799a6b7d5ad2a20d5bd (diff) | |
| parent | 1dd12e9d04cfe57594c46b85b5a3e0a3cb564d3f (diff) | |
| download | mariadb-git-08d51d05dc4373754ccaba6c958966bff525c552.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 69126e35554..693229c5a24 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1912,12 +1912,13 @@ bool dispatch_command(enum enum_server_command command, THD *thd, #endif ulong uptime = (ulong) (thd->start_time - start_time); sprintf((char*) buff, - "Uptime: %ld Threads: %d Questions: %lu Slow queries: %lu Opens: %ld Flush tables: %ld 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, (int) thread_count, (ulong) thd->query_id, (ulong) thd->status_var.long_query_count, thd->status_var.opened_tables, refresh_version, cached_tables(), - uptime ? (float)thd->query_id/(float)uptime : 0); + (uptime ? (ulonglong2double(thd->query_id) / (double) uptime) : + (double) 0)); #ifdef SAFEMALLOC if (sf_malloc_cur_memory) // Using SAFEMALLOC sprintf(strend(buff), " Memory in use: %ldK Max memory used: %ldK", |