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

[Andrei Elkin]

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

 2860 Andrei Elkin	2009-06-08
      Bug #37714   rpl.rpl_heartbeat fails sporadically in pushbuild due to timeout 
      
      Restroring the pre-debug push aelkin@stripped
      values of slave net timeout and hb to reduce the test pass time as twice.
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
    Restroring the pre-debug push aelkin@stripped
    values (requested as todo in that push).
=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-06-03 15:47:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-06-08 17:31:18 +0000
@@ -45,7 +45,7 @@ Warnings:
 Warning	1624	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
 reset slave;
 drop table if exists t1;
-set @@global.slave_net_timeout= 20;
+set @@global.slave_net_timeout= 10;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.5;
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-06-03 15:47:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-06-08 17:31:18 +0000
@@ -113,7 +113,7 @@ drop table if exists t1;
 #
 
 connection slave;
-set @@global.slave_net_timeout= 20;
+set @@global.slave_net_timeout= 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;
@@ -133,7 +133,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 15;
 
 # check (compare with the previous show's results) that no rotation happened
 source include/show_slave_status.inc;