diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
| commit | bdd883ed9a68ff1e82528cc6b33316d98894cfd2 (patch) | |
| tree | 93081c72225d399ac93ae0d8bb301a13cfc9a50c /sql/sql_show.cc | |
| parent | 2cba9e0cdccfac6f93a54e2ba12eb9926cfaa0a1 (diff) | |
| parent | f3a78f392dad24391c19464731833e2bdf19bdef (diff) | |
| download | mariadb-git-bdd883ed9a68ff1e82528cc6b33316d98894cfd2.tar.gz | |
5.5. merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b61bfe2aa57..ff5f732108b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2646,7 +2646,8 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) command_name[tmp->command].length, cs); /* MYSQL_TIME */ ulonglong start_utime= tmp->start_time * HRTIME_RESOLUTION + tmp->start_time_sec_part; - ulonglong utime= start_utime < unow.val ? unow.val - start_utime : 0; + ulonglong utime= start_utime && start_utime < unow.val + ? unow.val - start_utime : 0; table->field[5]->store(utime / HRTIME_RESOLUTION, TRUE); /* STATE */ if ((val= thread_state_info(tmp))) |