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:holyfoot@stripped

 3075 Andrei Elkin	2009-02-24
      only comments regarding to bug#37714. The push is to make pb executing rpl_heartbeat
modified:
  mysql-test/suite/rpl/t/rpl_heartbeat.test

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-02-23 13:30:29 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-02-24 15:04:07 +0000
@@ -112,7 +112,7 @@ drop table if exists t1;
 #
 
 connection slave;
-set @@global.slave_net_timeout= 20;
+set @@global.slave_net_timeout= 20; # TODO/bug#37714: restore to 10
 --replace_result $MASTER_MYPORT MASTER_PORT
 # no error this time but rather a warning
 eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.5;
@@ -132,7 +132,7 @@ source include/show_slave_status.inc;
 # That would cause reconnecting and relaylog rotation w/o the fix i.e
 # without a heartbeat received.
 
-real_sleep 30;
+real_sleep 30; # TODO/bug#37714: restore to 15
 
 # check (compare with the previous show's results) that no rotation happened
 source include/show_slave_status.inc;