Skip to content

Commit 9503743

Browse files
Fix flaky rpl_binlog_trx_meta_data_multi_table
Summary: `purge binary logs before now()` is flaky because it depends on time. Replacing that with `purge binary logs to $binlog`. Squash with D10120351 Reviewed By: yashtc Differential Revision: D10185280 fbshipit-source-id: c65c6c7
1 parent b45040a commit 9503743

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

mysql-test/suite/rpl/r/rpl_binlog_trx_meta_data_multi_table.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ insert into t1 values();
1212
insert into t2 values();
1313
insert into t2 values();
1414
flush logs;
15-
purge binary logs before now();
15+
purge binary logs to 'binlog';
1616
flush logs;
17-
purge binary logs before now();
17+
purge binary logs to 'binlog';
1818
delete t1, t2 from t1, t2;
1919
flush logs;
2020
"There should be only one rows_query event in master binlog"

mysql-test/suite/rpl/t/rpl_binlog_trx_meta_data_multi_table.test

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ sync_slave_with_master;
1818
# start a fresh binlog
1919
connection master;
2020
flush logs;
21-
purge binary logs before now();
21+
let $binlog= query_get_value(SHOW MASTER STATUS, File, 1);
22+
replace_result $binlog binlog;
23+
eval purge binary logs to '$binlog';
2224

2325
connection slave;
2426
flush logs;
25-
purge binary logs before now();
27+
let $binlog= query_get_value(SHOW MASTER STATUS, File, 1);
28+
replace_result $binlog binlog;
29+
eval purge binary logs to '$binlog';
2630

2731
# multi-table statement, there should only be one rows_query event for this
2832
connection master;

0 commit comments

Comments
 (0)