bzr push into mysql-trunk branch (nuno.carvalho:3836 to 3837)

[Nuno Carvalho]

 3837 Nuno Carvalho	2012-02-03 [merge]
      Merge from mysql-5.5 to mysql-trunk.
      
      Conflicts:
       mysql-test/collections/default.experimental

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

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-02-01 08:59:14 +0000
+++ b/mysql-test/collections/default.experimental	2012-02-03 14:30:11 +0000
@@ -48,7 +48,6 @@ innodb.innodb_monitor
 
 rpl.rpl_change_master_dbug               # BUG#11933491 2011-06-13 Anitha  Test fails on redhat 
 rpl.rpl_delayed_slave                    # BUG#11764654 rpl_delayed_slave fails sporadically in pb
-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 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_seconds_behind_master            # BUG#11765124 2010-11-24 luis fails sporadically on pb2

No bundle (reason: useless for push emails).