bzr commit into mysql-6.0-rpl branch (aelkin:2859) Bug#37714

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-rpl-bug37714-rpl_heartbeat/ based on revid:aelkin@stripped

 2859 Andrei Elkin	2009-06-03
      Bug #37714   rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout 
      
      cleaning the test out of a debug print.
modified:
  mysql-test/suite/rpl/r/rpl_heartbeat.result
  mysql-test/suite/rpl/t/rpl_heartbeat.test

per-file messages:
  mysql-test/suite/rpl/r/rpl_heartbeat.result
    results updated.
  mysql-test/suite/rpl/t/rpl_heartbeat.test
    removing a debug printout.
=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-04-03 16:24:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-06-03 15:47:30 +0000
@@ -139,7 +139,5 @@ Variable_name	Slave_heartbeat_period
 Value	0.500
 A heartbeat has been received by the slave
 drop table t1;
-*** debug: 356 ***
-#connection slave
 set @@global.slave_net_timeout=@restore_slave_net_timeout;
 End of tests

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-04-03 16:24:50 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-06-03 15:47:30 +0000
@@ -173,10 +173,6 @@ while (`select $slave_value = 0`)
 connection master;
 drop table t1;
 
-# debug print out, todo: remove after bug#37714 is fixed
-let $last_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
-echo *** debug: $last_pos ***
-
 #connection slave;
 sync_slave_with_master;
 set @@global.slave_net_timeout=@restore_slave_net_timeout;