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

[Andrei Elkin]

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

 3075 Andrei Elkin	2009-02-23
      Bug #37714 rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout
      
      Logs on PB show that the IO thread was down by the clean-up (drop table t1) of the test.
      A propable reason for IO thread to stop is a small value of slave_net_timeout - chosen as 
      tradeoff betweeen a need to test counting of heartbeats and the test execution time.
      On a slow env it can be that the timeout elapses first before any heartbeat got arrived.
      
      Fixed with performing the clean-up separately by the master and the slave.
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 changed
  mysql-test/suite/rpl/t/rpl_heartbeat.test
    synchronization at clean-up is removed. Instead, the slave and the master makes that
    separately. The reason is in values of timeouts that is difficult to tune a way to guarantee
    the slave IO is always connected by the cleanup time.
=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-01-26 16:03:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-02-23 13:21:56 +0000
@@ -138,4 +138,6 @@ Variable_name	Slave_heartbeat_period
 Value	0.500
 A heartbeat has been received by the slave
 drop table t1;
+stop slave;
+drop table t1;
 End of tests

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-02-05 13:07:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-02-23 13:21:56 +0000
@@ -166,13 +166,14 @@ while (`select $slave_value = 0`)
   let $slave_value= query_get_value("SHOW STATUS like 'Slave_received_heartbeats'", Value, 1);
 }
 --echo A heartbeat has been received by the slave
+
 # cleanup
+connection slave;
+drop table t1;
+stop slave;
 
 connection master;
 drop table t1;
 
-#connection slave;
-sync_slave_with_master;
-
 
 --echo End of tests