From: Dmitry Lenev
Date: October 13 2010 7:22am
Subject: bzr commit into mysql-5.5-runtime branch (Dmitry.Lenev:3162) Bug#57422
List-Archive: http://lists.mysql.com/commits/120623
X-Bug: 57422
Message-Id: <20101013072219.167A5E5ACB@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2001100155=="

--===============2001100155==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/dlenev/src/bzr/mysql-5.5-rt-57422/ based on revid:jon.hauglid@stripped

 3162 Dmitry Lenev	2010-10-13
      Fix for bug #57422 "rpl_row_sp003 sporadically fails under
      heavy load".
      
      rpl_row_sp003.test has sporadically failed when run on machine
      under heavy load or on slow hardware.
      
      This patch fixes races in the test which were causing these
      failures and also removes unnecessary 100 second wait from it. 

    modified:
      mysql-test/extra/rpl_tests/rpl_row_sp003.test
      mysql-test/suite/rpl/r/rpl_row_sp003.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_sp003.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_sp003.test	2009-11-26 23:32:01 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_sp003.test	2010-10-13 07:20:50 +0000
@@ -36,9 +36,22 @@ send CALL test.p1();
 
 connection master;
 # To make sure tha the call on master1 arrived at the get_lock
-sleep 1;
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where state = 'User lock' and
+        info = 'SELECT  get_lock("test", 100)';
+--source include/wait_condition.inc
 CALL test.p2();
 SELECT release_lock("test");
+
+connection master1;
+# Reap CALL test.p1() to ensure that it has fully completed
+# before doing any selects on test.t1.
+--reap
+# Release lock acquired by it.
+SELECT release_lock("test");
+
+connection master;
 SELECT * FROM test.t1; 
 #show binlog events;
 --source include/wait_for_ndb_to_binlog.inc
@@ -51,6 +64,7 @@ DROP TABLE IF EXISTS test.t1;
 eval CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=$engine_type;
 CALL test.p2();
 CALL test.p1();
+SELECT release_lock("test");
 SELECT * FROM test.t1;
 
 sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_sp003.result'
--- a/mysql-test/suite/rpl/r/rpl_row_sp003.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_sp003.result	2010-10-13 07:20:50 +0000
@@ -26,6 +26,11 @@ CALL test.p2();
 SELECT release_lock("test");
 release_lock("test")
 1
+get_lock("test", 100)
+1
+SELECT release_lock("test");
+release_lock("test")
+1
 SELECT * FROM test.t1;
 a
 5
@@ -37,7 +42,10 @@ CREATE TABLE test.t1(a INT,PRIMARY KEY(a
 CALL test.p2();
 CALL test.p1();
 get_lock("test", 100)
-0
+1
+SELECT release_lock("test");
+release_lock("test")
+1
 SELECT * FROM test.t1;
 a
 8


--===============2001100155==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.lenev@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-5.5-rt-57422/
# testament_sha1: 1f57ad0c7797d569dac0b660f1a1858ae7d820f3
# timestamp: 2010-10-13 11:22:18 +0400
# base_revision_id: jon.hauglid@stripped\
#   o0tkkwwhylb6fo0f
# 
# Begin bundle
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
KVjoR/8XckU4UJBh4vTw


--===============2001100155==--