bzr commit into mysql-6.0-bugteam branch (aelkin:3177) Bug#37714

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-6.0-bugteam/ based on revid:gni@stripped

 3177 Andrei Elkin	2009-04-03
      bug#37714
      
      debug print out for the test is added
modified:
  mysql-test/suite/rpl/r/rpl_heartbeat.result
  mysql-test/suite/rpl/t/rpl_heartbeat.test

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-03-16 19:26:18 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-04-03 16:24:50 +0000
@@ -139,5 +139,7 @@ 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-03-16 19:26:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-04-03 16:24:50 +0000
@@ -173,6 +173,10 @@ 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;