mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug#42891: Tests cleanup

Browse source 
Fix for backport into mysql-5.1-rep+2
This commit is contained in:
Serge Kozlov 2009-10-10 14:27:07 +04:00
parent 124ad21d01
commit 2151a821aa
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_heartbeat.result
View file

@ -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

2
mysql-test/suite/rpl/t/rpl_heartbeat.test
View file

@ -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