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

…previous test
MariaDB · Nov 9, 2022 · 0ffdcf6 · 0ffdcf6
1 parent 6b91792
commit 0ffdcf6
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 6 deletions.
diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result
@@ -1,3 +1,4 @@
+reset master;
 set sql_log_bin=0;
 drop table if exists t1,v1,v2,v3,v4,v1badcheck;
 drop view if exists t1,v1,v2,v3,v4,v1badcheck;

diff --git a/mysql-test/main/mysql_upgrade_view.test b/mysql-test/main/mysql_upgrade_view.test
@@ -1,5 +1,5 @@
 -- source include/have_log_bin.inc
-
+reset master; # clear binlogs
 set sql_log_bin=0;
 --disable_warnings
 drop table if exists t1,v1,v2,v3,v4,v1badcheck;

diff --git a/mysql-test/main/stat_tables_rbr.result b/mysql-test/main/stat_tables_rbr.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Bug mdev-463: assertion failure when running ANALYZE with RBR on
 # 

diff --git a/mysql-test/main/stat_tables_rbr.test b/mysql-test/main/stat_tables_rbr.test
@@ -1,7 +1,7 @@
 --source include/have_binlog_format_row.inc
 --source include/have_innodb.inc
 --source include/have_partition.inc
-
+RESET MASTER; # clear up binlogs
 --echo #
 --echo # Bug mdev-463: assertion failure when running ANALYZE with RBR on
 --echo # 

diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
@@ -1,3 +1,4 @@
+reset master;
 drop table if exists t1;
 create table t1 (a int, b int) engine=innodb;
 begin;

diff --git a/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result b/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result
@@ -1,3 +1,4 @@
+reset master;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#

diff --git a/mysql-test/suite/binlog/r/binlog_stm_do_db.result b/mysql-test/suite/binlog/r/binlog_stm_do_db.result
@@ -1,3 +1,4 @@
+RESET MASTER;
 SET @old_isolation_level= @@session.tx_isolation;
 SET @@session.tx_isolation= 'READ-COMMITTED';
 CREATE DATABASE b42829;

diff --git a/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result b/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result
@@ -1,3 +1,4 @@
+reset master;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 select @@innodb_autoinc_lock_mode;
 @@innodb_autoinc_lock_mode

diff --git a/mysql-test/suite/binlog/t/binlog_stm_binlog.test b/mysql-test/suite/binlog/t/binlog_stm_binlog.test
@@ -2,7 +2,7 @@
 -- source include/have_binlog_format_mixed.inc
 let collation=utf8_unicode_ci;
 --source include/have_collation.inc
-
+reset master; # clear up binlogs
 --disable_warnings
 drop table if exists t1;
 --enable_warnings

diff --git a/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test b/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test
@@ -1,6 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_binlog_format_statement.inc
-
+reset master; # clear up binlogs
 --exec $MYSQL_CLIENT_TEST test_datetime_ranges_mdev15289 > $MYSQLTEST_VARDIR/log/binlog_stm_datetime_ranges_mysql_client_test.out.log 2>&1
 
 --let $binlog_file = LAST

diff --git a/mysql-test/suite/binlog/t/binlog_stm_do_db.test b/mysql-test/suite/binlog/t/binlog_stm_do_db.test
@@ -37,7 +37,7 @@
 -- source include/have_log_bin.inc
 -- source include/have_innodb.inc
 -- source include/have_binlog_format_statement.inc
-
+RESET MASTER; # clear up binlogs
 SET @old_isolation_level= @@session.tx_isolation;
 SET @@session.tx_isolation= 'READ-COMMITTED';
 

diff --git a/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test b/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test
@@ -1,6 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed.inc
-
+reset master; #clear up binlogs
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 
 select @@innodb_autoinc_lock_mode;