diff options
| author | Serge Kozlov <Serge.Kozlov@sun.com> | 2009-10-10 14:27:07 +0400 |
|---|---|---|
| committer | Serge Kozlov <Serge.Kozlov@sun.com> | 2009-10-10 14:27:07 +0400 |
| commit | a8a96593cad7fbea51f8c8743776e609666f83d5 (patch) | |
| tree | 8d118ef02a50869514d64cff8417d584b73c467b | |
| parent | 6a541923c390a81a64a373fc91aafaea6f748b85 (diff) | |
| download | mariadb-git-a8a96593cad7fbea51f8c8743776e609666f83d5.tar.gz | |
Bug#42891: Tests cleanup
Fix for backport into mysql-5.1-rep+2
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_heartbeat.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_heartbeat.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result index 3bd2ad108ca..b79545b8336 100644 --- a/mysql-test/suite/rpl/r/rpl_heartbeat.result +++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result @@ -1,4 +1,5 @@ reset master; +set @restore_slave_net_timeout= @@global.slave_net_timeout; set @@global.slave_net_timeout= 10; 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. @@ -140,4 +141,5 @@ Variable_name Slave_heartbeat_period Value 0.500 A heartbeat has been received by the slave drop table t1; +set @@global.slave_net_timeout= @restore_slave_net_timeout; End of tests diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat.test b/mysql-test/suite/rpl/t/rpl_heartbeat.test index 4304888d6a5..3b0d21052ee 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test @@ -16,6 +16,7 @@ connection master; reset master; connection slave; +set @restore_slave_net_timeout= @@global.slave_net_timeout; set @@global.slave_net_timeout= 10; ### @@ -161,6 +162,7 @@ drop table t1; #connection slave; sync_slave_with_master; +set @@global.slave_net_timeout= @restore_slave_net_timeout; --echo End of tests |