From: Dmitry Lenev
Date: October 13 2010 11:22am
Subject: bzr push into mysql-5.5-runtime branch (Dmitry.Lenev:3162 to 3163) Bug#57422
List-Archive: http://lists.mysql.com/commits/120673
X-Bug: 57422
Message-Id: <20101013112220.BEF67E5ACB@mockturtle>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1489961843=="

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

 3163 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
 3162 Konstantin Osipov	2010-10-13
      Fix Bug#56443 remove last 'mysqld_show_column_type' remains
     @ sql/sql_show.h
        Remove an unused declaration.

    modified:
      sql/sql_show.h
=== 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 11:21:45 +0000
@@ -35,10 +35,23 @@ connection master1;
 send CALL test.p1();
 
 connection master;
-# To make sure tha the call on master1 arrived at the get_lock
-sleep 1;
+# Make sure that the call on master1 arrived at the get_lock.
+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 11:21:45 +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


--===============1489961843==
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: b5db59375e434455774a060dc50bce843eaef1a8
# timestamp: 2010-10-13 15:22:20 +0400
# base_revision_id: kostja@stripped
# 
# Begin bundle
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


--===============1489961843==--