summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-06-29 12:06:00 +0400
committerSergey Vojtovich <svoj@mariadb.org>2015-06-29 12:06:00 +0400
commit08fa60e5f3643cd87bb1e4578071f4db3557f776 (patch)
treeb20eb48559b482f6857722da67d98451fdaaccc0
parenta0f5f407eb7dfd7a2d7669e4f61245c72b1e0583 (diff)
downloadmariadb-git-08fa60e5f3643cd87bb1e4578071f4db3557f776.tar.gz
MDEV-8382 - Processlist returns random numbers in Time column
Time column of SHOW PROCESSLIST was returned in microseconds after rev. 8f603bc. Revert original timescale (seconds).
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b0773d27655..802c4195d8e 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2460,7 +2460,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
else
protocol->store(command_name[thd_info->command].str, system_charset_info);
if (thd_info->start_time && now > thd_info->start_time)
- protocol->store_long(now - thd_info->start_time);
+ protocol->store_long((now - thd_info->start_time) / HRTIME_RESOLUTION);
else
protocol->store_null();
protocol->store(thd_info->state_info, system_charset_info);