database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

5.5. merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-11-13 14:07:58 +01:00
parent 2cba9e0cdc f3a78f392d
commit bdd883ed9a
51 changed files with 487 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_show.cc
View File

@ -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)))