bzr push into mysql-5.5 branch (tor.didriksen:3708 to 3709) Bug#11753187

[Tor Didriksen]

 3709 Tor Didriksen	2012-01-26
      Bug#11753187 post-push fix: fix .result file

    modified:
      mysql-test/r/mysqld--help-win.result
 3708 Nuno Carvalho	2012-01-25
      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.
      
      MASTER_HEARTBEAT_PERIOD had the default value (slave_net_timeout/2) so
      wait on "Heartbeat event received on master", that only waits for 1
      minute, sometimes timeout before heartbeat arrives. Fixed setting a
      smaller period value.

    modified:
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-01-25 09:59:30 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-01-26 07:00:37 +0000
@@ -679,7 +679,7 @@ The following options may be given as th
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
  --standalone        Dummy option to start as a standalone program (NT).
- --stored-program-cache=#
+ --stored-program-cache=# 
  The soft upper limit for number of cached stored routines
  for one connection.
  -s, --symbolic-links 

No bundle (reason: useless for push emails).