Commit 6a4ac4c7 authored by Sergei Golubchik's avatar Sergei Golubchik

Fixed random failure in main.kill_processlist-6619 (take 3)

followup for 81f75ca8

improve over take 2. It's technically possible, though unlikely,
to see THD after it already reset the info to NULL, but has not
changed the command to COM_SLEEP yet (see THD::mark_connection_idle()).

Let's wait for "Sleep", not for NULL.
parent 69b5fdf3
...@@ -10,7 +10,7 @@ source include/wait_condition.inc; ...@@ -10,7 +10,7 @@ source include/wait_condition.inc;
--connect (con1,localhost,root,,) --connect (con1,localhost,root,,)
--let $con_id = `SELECT CONNECTION_ID()` --let $con_id = `SELECT CONNECTION_ID()`
let $wait_condition=select info is NULL from information_schema.processlist where id != $con_id; let $wait_condition=select command = 'sleep' from information_schema.processlist where id != $con_id;
source include/wait_condition.inc; source include/wait_condition.inc;
--replace_result Execute Query --replace_result Execute Query
...@@ -32,9 +32,7 @@ reap; ...@@ -32,9 +32,7 @@ reap;
SET DEBUG_SYNC='reset'; SET DEBUG_SYNC='reset';
# Wait until default connection has reset query string # Wait until default connection has reset query string
let $wait_condition= let $wait_condition=select command = 'sleep' from information_schema.processlist where id != $con_id;
SELECT COUNT(*) = 1 from information_schema.processlist
WHERE info is NULL;
--source include/wait_condition.inc --source include/wait_condition.inc
--replace_result Execute Query --replace_result Execute Query
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment