From: Nuno Carvalho
Date: February 3 2012 2:24pm
Subject: bzr push into mysql-5.5 branch (nuno.carvalho:3703 to 3704) Bug#12403008
List-Archive: http://lists.mysql.com/commits/142746
X-Bug: 12403008
Message-Id: <201202031424.q13EOEu1010854@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3704 Nuno Carvalho	2012-02-03
      BUG#12403008 RPL_HEARTBEAT_BASIC FAILS SPORADICALLY ON PUSHBUILD
            
      rpl_heartbeat_basic test fails sporadically on pushbuild because did
      not received all heartbeats from slave in circular replication.
      
      Removed from experimental collection.

    modified:
      mysql-test/collections/default.experimental
 3703 Ashish Agarwal	2012-02-03 [merge]
      BUG#11748748: Merge from mysql-5.1 to mysql-5.5

    modified:
      storage/archive/ha_archive.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-01-10 06:11:50 +0000
+++ b/mysql-test/collections/default.experimental	2012-02-03 14:23:33 +0000
@@ -12,7 +12,6 @@ main.signal_demo3 @solaris
 main.sp @solaris                         # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.wait_timeout @solaris               # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
 
-rpl.rpl_heartbeat_basic                  # BUG#12403008 2011-04-27 sven fails sporadically
 rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun
 

No bundle (reason: useless for push emails).