Commit 14b35d9f authored by mmakela's avatar mmakela

branches/5.1: innodb_bug51920.test: Make the test quicker and more deterministic.

Suggested by Vasil Dimov.
parent a1fcf027
...@@ -9,10 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST ...@@ -9,10 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO="UPDATE bug51920 SET i=2" WHERE INFO="UPDATE bug51920 SET i=2"
INTO @thread_id; INTO @thread_id;
KILL @thread_id; KILL @thread_id;
SELECT sleep(2);
sleep(2)
0
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id;
ID USER HOST DB COMMAND TIME STATE INFO
ERROR 70100: Query execution was interrupted ERROR 70100: Query execution was interrupted
DROP TABLE bug51920; DROP TABLE bug51920;
...@@ -22,8 +22,9 @@ WHERE INFO="UPDATE bug51920 SET i=2" ...@@ -22,8 +22,9 @@ WHERE INFO="UPDATE bug51920 SET i=2"
INTO @thread_id; INTO @thread_id;
KILL @thread_id; KILL @thread_id;
SELECT sleep(2); let $wait_condition =
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id; SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id;
-- source include/wait_condition.inc
connection con1; connection con1;
-- error ER_QUERY_INTERRUPTED -- error ER_QUERY_INTERRUPTED
......
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