Commit a8a96593 authored by Serge Kozlov's avatar Serge Kozlov

Bug#42891: Tests cleanup

Fix for backport into mysql-5.1-rep+2
parent 6a541923
reset master; reset master;
set @restore_slave_net_timeout= @@global.slave_net_timeout;
set @@global.slave_net_timeout= 10; set @@global.slave_net_timeout= 10;
Warnings: 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. 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 ...@@ -140,4 +141,5 @@ Variable_name Slave_heartbeat_period
Value 0.500 Value 0.500
A heartbeat has been received by the slave A heartbeat has been received by the slave
drop table t1; drop table t1;
set @@global.slave_net_timeout= @restore_slave_net_timeout;
End of tests End of tests
...@@ -16,6 +16,7 @@ connection master; ...@@ -16,6 +16,7 @@ connection master;
reset master; reset master;
connection slave; connection slave;
set @restore_slave_net_timeout= @@global.slave_net_timeout;
set @@global.slave_net_timeout= 10; set @@global.slave_net_timeout= 10;
### ###
...@@ -161,6 +162,7 @@ drop table t1; ...@@ -161,6 +162,7 @@ drop table t1;
#connection slave; #connection slave;
sync_slave_with_master; sync_slave_with_master;
set @@global.slave_net_timeout= @restore_slave_net_timeout;
--echo End of tests --echo End of tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment