VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 12:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

MDEV-34029 rpl.rpl_heartbeat can fail when (BB) mtr reorders tests

Browse Source 
rpl.rpl_heartbeat turns out to miss a standard include/master-slave
header which made it potentially in BB and actually with manual mtr
failing as it may have used a previous slave GTID state.

Fixed with installing the standard rpl suite header/footer in the
test file.
This commit is contained in:
Andrei
2024-04-29 20:10:21 +03:00
parent ec09c034d8
commit 6a63204c36
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/rpl/r/rpl_heartbeat.result
View File

@ -1,8 +1,9 @@
connect master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
connect slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK;
include/master-slave.inc
[connection master]
connection master;
reset master;
connection slave;
include/stop_slave.inc
set @restore_slave_net_timeout= @@global.slave_net_timeout;
set @@global.slave_net_timeout= 10;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
@ -68,5 +69,5 @@ connection master;
drop table t1;
connection slave;
set @@global.slave_net_timeout= @restore_slave_net_timeout;
include/stop_slave.inc
include/rpl_end.inc
End of tests

8
mysql-test/suite/rpl/t/rpl_heartbeat.test
View File

@ -8,14 +8,13 @@
# - SHOW STATUS like 'Slave_heartbeat_period' report
-- source include/have_log_bin.inc
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
-- source include/master-slave.inc
connection master;
reset master;
connection slave;
-- source include/stop_slave.inc
set @restore_slave_net_timeout= @@global.slave_net_timeout;
--disable_warnings
set @@global.slave_net_timeout= 10;
@ -170,6 +169,5 @@ set @@global.slave_net_timeout= @restore_slave_net_timeout;
--disable_prepare_warnings
--source include/stop_slave.inc
--source include/rpl_end.inc
--echo End of tests