database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-4683 query start_time not reset when going to sleep

Browse Source
This commit is contained in:
Sergei Golubchik
2013-07-01 12:02:44 +02:00
parent a924e9004c
commit 03c71ff2ba
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/processlist.result
View File

@ -7,3 +7,9 @@ SELECT INFO,TIME,TIME_MS FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO IS NULL;
SET DEBUG_SYNC = 'now SIGNAL fill_schema_proceed'; SET DEBUG_SYNC = 'now SIGNAL fill_schema_proceed';
INFO TIME TIME_MS INFO TIME TIME_MS
NULL 0 0.000 NULL 0 0.000
select sleep(5);
sleep(5)
0
select command, time < 5 from information_schema.processlist where id != connection_id();
command time < 5
Sleep 1

13
mysql-test/t/processlist.test
View File

@ -18,5 +18,18 @@ SET DEBUG_SYNC = 'now SIGNAL fill_schema_proceed';
connection con1; connection con1;
reap; reap;
connection default;
#
# MDEV-4683 query start_time not reset when going to sleep
#
connection con1;
select sleep(5); #run a query that will take some time
connection default;
# verify that the time in COM_SLEEP doesn't include the query run time
select command, time < 5 from information_schema.processlist where id != connection_id();
disconnect con1; disconnect con1;

1
sql/sql_parse.cc
View File

@ -1461,6 +1461,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd_proc_info(thd, "cleaning up"); thd_proc_info(thd, "cleaning up");
thd->reset_query(); thd->reset_query();
thd->command=COM_SLEEP; thd->command=COM_SLEEP;
thd->set_time();
dec_thread_running(); dec_thread_running();
thd_proc_info(thd, 0); thd_proc_info(thd, 0);
thd->packet.shrink(thd->variables.net_buffer_length); // Reclaim some memory thd->packet.shrink(thd->variables.net_buffer_length); // Reclaim some memory