Commit 3226787b authored by Sergei Golubchik's avatar Sergei Golubchik

Revert "Fixed random failure in main.kill_processlist-6619"

This reverts commit 8b3f470c.

because it doesn't work, the test still fails, and even more than before
parent 58c7f631
SET DEBUG_SYNC='dispatch_command_end SIGNAL ready WAIT_FOR go';
select 1;
connect con1,localhost,root,,; connect con1,localhost,root,,;
SET DEBUG_SYNC='now wait_for ready';
SET DEBUG_SYNC='now signal go';
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info Progress Id User Host db Command Time State Info Progress
# root # test Sleep # # NULL 0.000 # root # test Sleep # # NULL 0.000
...@@ -10,8 +6,6 @@ Id User Host db Command Time State Info Progress ...@@ -10,8 +6,6 @@ Id User Host db Command Time State Info Progress
SET DEBUG_SYNC='before_execute_sql_command SIGNAL ready WAIT_FOR go'; SET DEBUG_SYNC='before_execute_sql_command SIGNAL ready WAIT_FOR go';
SHOW PROCESSLIST; SHOW PROCESSLIST;
connection default; connection default;
1
1
SET DEBUG_SYNC='now WAIT_FOR ready'; SET DEBUG_SYNC='now WAIT_FOR ready';
KILL QUERY con_id; KILL QUERY con_id;
SET DEBUG_SYNC='now SIGNAL go'; SET DEBUG_SYNC='now SIGNAL go';
......
...@@ -4,14 +4,7 @@ ...@@ -4,14 +4,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
# This is to ensure that the following SHOW PROCESSLIST does not show the query
SET DEBUG_SYNC='dispatch_command_end SIGNAL ready WAIT_FOR go';
--send select 1
--connect (con1,localhost,root,,) --connect (con1,localhost,root,,)
SET DEBUG_SYNC='now wait_for ready';
SET DEBUG_SYNC='now signal go';
--let $con_id = `SELECT CONNECTION_ID()` --let $con_id = `SELECT CONNECTION_ID()`
--replace_result Execute Query --replace_result Execute Query
--replace_column 1 # 3 # 6 # 7 # --replace_column 1 # 3 # 6 # 7 #
...@@ -19,8 +12,6 @@ SHOW PROCESSLIST; ...@@ -19,8 +12,6 @@ SHOW PROCESSLIST;
SET DEBUG_SYNC='before_execute_sql_command SIGNAL ready WAIT_FOR go'; SET DEBUG_SYNC='before_execute_sql_command SIGNAL ready WAIT_FOR go';
send SHOW PROCESSLIST; send SHOW PROCESSLIST;
--connection default --connection default
--reap
# We must wait for the SHOW PROCESSLIST query to have started before sending # We must wait for the SHOW PROCESSLIST query to have started before sending
# the kill. Otherwise, the KILL may be lost since it is reset at the start of # the kill. Otherwise, the KILL may be lost since it is reset at the start of
# query execution. # query execution.
......
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