Skip to content

Commit 24cfe04

Browse files
author
Luis Soares
committed
BUG#21053526 (Post-push fix for the test case.)
Post-push fix. Fixing the test case binlog_xa_handling, making it more robust. Clean up the binlog (RESET MASTER) before running this particular test case (since it iterates over the log to find the correct event). Otherwise, it might take too long or exhaust the loop_count and bail out with a (false positive) failure.
1 parent f2300ce commit 24cfe04

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

mysql-test/suite/binlog/r/binlog_xa_handling.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ XA END'';
88
XA PREPARE'';
99
XA COMMIT'';
1010
DROP TABLE t1;
11+
RESET MASTER;
1112
CREATE TABLE t1 (c1 INT);
1213
XA BEGIN 'xa1';
1314
INSERT INTO t1 VALUES (1);
1415
XA END 'xa1';
1516
XA COMMIT 'xa1' ONE PHASE;
1617
[Validate that SHOW BINLOG EVENTS shows the ONE PHASE statement.]
1718
DROP TABLE t1;
19+
RESET MASTER;

mysql-test/suite/binlog/t/binlog_xa_handling.test

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ DROP TABLE t1;
3737
# mysql-test/extra/binlog_tests/binlog_xa_prepared.test
3838
#
3939

40+
# clean up binary log so that the following operation
41+
# does not have to scan through a long history of
42+
# events in the log (potentially causing a failure).
43+
RESET MASTER;
44+
4045
CREATE TABLE t1 (c1 INT);
4146
XA BEGIN 'xa1';
4247
INSERT INTO t1 VALUES (1);
@@ -48,3 +53,7 @@ XA COMMIT 'xa1' ONE PHASE;
4853
--source include/wait_for_binlog_event.inc
4954

5055
DROP TABLE t1;
56+
57+
# clean up the binary log at in the end of the test
58+
# case as well.
59+
RESET MASTER;

0 commit comments

Comments
 (0)