From 604ab4d274ab036acd1725707b436836e98699a0 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 26 Mar 2010 15:20:11 +0400 Subject: Applying InnoDB snapshot Detailed revision comments: r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines branches/5.1: Fix a non-determinism in innodb_bug38231. Reported by: Sergey Vojtovich r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines branches/5.1: Fix a non-determinism in innodb_bug38231. Reported by: Sergey Vojtovich --- mysql-test/t/innodb_bug38231.test | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/t/innodb_bug38231.test b/mysql-test/t/innodb_bug38231.test index 54f58844c42..1611cb56203 100644 --- a/mysql-test/t/innodb_bug38231.test +++ b/mysql-test/t/innodb_bug38231.test @@ -27,6 +27,21 @@ SET autocommit=0; -- send LOCK TABLE bug38231 WRITE; +# When con1 does UNLOCK below this will release either con2 or con3 which are +# both waiting on LOCK. At the end we must first --reap and UNLOCK the +# connection that has been released, otherwise it will wait forever. We assume +# that the released connection will be the first one that has gained the LOCK, +# thus we force the order here - con2 does LOCK first, then con3. In other +# words we wait for LOCK from con2 above to be exected before doing LOCK in +# con3. +-- connection con1 +let $wait_condition = + SELECT COUNT(*) = 1 FROM information_schema.processlist + WHERE info = 'LOCK TABLE bug38231 WRITE'; +-- source include/wait_condition.inc +# the above enables query log, re-disable it +-- disable_query_log + -- connection con3 SET autocommit=0; -- send -- cgit v1.2.1