diff options
| author | unknown <monty@mysql.com> | 2005-04-01 15:06:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-01 15:06:35 +0300 |
| commit | 0c9304fd6d9b1648f3157a6a5e3f0ec536d82560 (patch) | |
| tree | 0c7ef48f52e3bfe3c659c446004364da743f630b /sql/sql_parse.cc | |
| parent | 382df7a19e42aa07c5d574921b852dfcd93c5bb5 (diff) | |
| parent | db7561ecf8b703e285320f2e0fcec7daf72ca9d6 (diff) | |
| download | mariadb-git-0c9304fd6d9b1648f3157a6a5e3f0ec536d82560.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 21282e9e620..1415068fe89 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1909,10 +1909,11 @@ 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: %ld Opens: %ld Flush tables: %ld Open tables: %u Queries per second avg: %.3f", + "Uptime: %ld Threads: %d Questions: %lu Slow queries: %lu Opens: %ld Flush tables: %ld Open tables: %u Queries per second avg: %.3f", uptime, - (int) thread_count,thd->query_id,thd->status_var.long_query_count, - thd->status_var.opened_tables,refresh_version, cached_tables(), + (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); #ifdef SAFEMALLOC if (sf_malloc_cur_memory) // Using SAFEMALLOC |