MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:May 25 2009 12:35pm
Subject:bzr commit into mysql-5.1-telco-6.3 branch (jonas:2974)
View as plain text  
#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 2974 Jonas Oreland	2009-05-25
      ndb - fix mtr "check" for rpl_heartbeat, where slave_net_timeout is not properly reset
        at end of test

    M  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-04 15:25:32 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-05-25 12:35:03 +0000
@@ -25,6 +25,7 @@ connection slave;
 # The warning has to be disabled as mtr can change the init value
 # for slave_net_timeout
 --disable_warnings
+--let SAVE_NET_TIMEOUT=`select @@global.slave_net_timeout`;
 set @@global.slave_net_timeout= 10;
 --enable_warnings
 ###
@@ -164,6 +165,11 @@ while (`select $slave_value = 0`)
 --echo A heartbeat has been received by the slave
 # cleanup
 
+connection slave;
+--disable_query_log
+eval set @@global.slave_net_timeout= $SAVE_NET_TIMEOUT;
+--enable_query_log
+
 connection master;
 drop table t1;
 


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20090525123503-oixzlhmplo6879g4.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (jonas:2974)Jonas Oreland25 May