From bdbd9cfff375e435a628a6d742d33de0769336ab Mon Sep 17 00:00:00 2001 From: mmakela <Unknown> Date: Wed, 31 Mar 2010 10:54:30 +0000 Subject: [PATCH] branches/zip: Merge revisions 6918:6921 from branches/5.1: ------------------------------------------------------------------------ r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.result M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Make the test quicker and more deterministic. Suggested by Vasil Dimov. ------------------------------------------------------------------------ --- mysql-test/innodb_bug51920.result | 5 ----- mysql-test/innodb_bug51920.test | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mysql-test/innodb_bug51920.result b/mysql-test/innodb_bug51920.result index 8d919b431b0..4c2ec3e01e5 100644 --- a/mysql-test/innodb_bug51920.result +++ b/mysql-test/innodb_bug51920.result @@ -9,10 +9,5 @@ SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO="UPDATE bug51920 SET i=2" INTO @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 DROP TABLE bug51920; diff --git a/mysql-test/innodb_bug51920.test b/mysql-test/innodb_bug51920.test index 4f22d7f0d06..4776f4701d3 100644 --- a/mysql-test/innodb_bug51920.test +++ b/mysql-test/innodb_bug51920.test @@ -22,8 +22,9 @@ WHERE INFO="UPDATE bug51920 SET i=2" INTO @thread_id; KILL @thread_id; -SELECT sleep(2); -SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id; +let $wait_condition = + SELECT COUNT(*)=0 FROM information_schema.processlist WHERE ID=@thread_id; +-- source include/wait_condition.inc connection con1; -- error ER_QUERY_INTERRUPTED -- 2.30.9