MDEV-28970: Add RESET MASTER to clear possible remaining binlog from …

…previous test
MariaDB · Nov 9, 2022 · e616c9a · e616c9a
1 parent 3278c57
commit e616c9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 CREATE TEMPORARY SEQUENCE seq_1;
 XA START '3';
 CREATE TEMPORARY TABLE tmp_1(c INT);

diff --git a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test
@@ -4,7 +4,7 @@
 --source include/have_binlog_format_mixed.inc
 --source include/have_innodb.inc
 
-
+RESET MASTER; # clear binlogs
 # MDEV-22420 DDL on temporary object is prohibited when XA is in prepare state
 
 # Temporary sequnce may not be created within a transaction

diff --git a/mysql-test/suite/maria/rollback.result b/mysql-test/suite/maria/rollback.result
@@ -1,3 +1,4 @@
+reset master;
 call mtr.add_suppression("Table '.*' is marked as crashed and should be repaired");
 call mtr.add_suppression("Checking table: .*");
 create table t1 (a int primary key auto_increment, b int) engine=aria transactional= 1;

diff --git a/mysql-test/suite/maria/rollback.test b/mysql-test/suite/maria/rollback.test
@@ -3,6 +3,8 @@
 # no-protocol doesn't print warnings about repaired tables
 --source include/no_protocol.inc
 
+reset master; # clear binlogs
+
 call mtr.add_suppression("Table '.*' is marked as crashed and should be repaired");
 call mtr.add_suppression("Checking table: .*");