bzr commit into mysql-6.0-rpl branch (Serge.Kozlov:2824) WL#4641

[Serge Kozlov]

#At file:///home/ksm/sun/repo/WL4641/push-6.0-rpl/ based on revid:alfranio.correia@stripped

 2824 Serge Kozlov	2009-03-16
      WL#4641: fix for test case rpl_heartbeat_2slaves
      modified:
        mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
        mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result	2009-03-16 11:33:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result	2009-03-16 12:51:34 +0000
@@ -45,7 +45,7 @@ SELECT a FROM t1;
 a
 1000
 [on slave]
-Slave has received heartbeats (1 means 5 or more heartbeat events): 1
+Slave has received heartbeats (1 means 'yes'): 1
 
 *** Clean up ***
 DROP DATABASE test_slave1;

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test	2009-03-16 11:33:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test	2009-03-16 12:51:34 +0000
@@ -108,8 +108,8 @@ USE test_slave1;
 SELECT a FROM t1;
 --connection slave
 --echo [on slave]
-let $result= query_get_value(SELECT ($slave_rcvd_heartbeats_after - $slave_rcvd_heartbeats_before) > 5 AS Result, Result, 1);
---echo Slave has received heartbeats (1 means 5 or more heartbeat events): $result
+let $result= query_get_value(SELECT ($slave_rcvd_heartbeats_after - $slave_rcvd_heartbeats_before) > 0 AS Result, Result, 1);
+--echo Slave has received heartbeats (1 means 'yes'): $result
 --echo
 
 #