Merge 10.5 into 10.6

Author: dr-m

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);

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

@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

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

@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

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

@@ -1,3 +1,4 @@
+RESET MASTER;
 #
 # Verify that SET string values and character sets can be printed correctly
 #

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

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

@@ -20,6 +20,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

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

@@ -21,6 +21,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

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

@@ -21,6 +21,7 @@
 --let $MYSQLD_DATADIR= `select @@datadir`
 --let $binlog_file= $MYSQLD_DATADIR/master-bin.000001
 
+RESET MASTER;
 --echo #
 --echo # Verify that SET string values and character sets can be printed correctly
 --echo #

mysql-test/suite/maria/rollback.result

@@ -1,3 +1,4 @@
+reset master;
 call mtr.add_suppression("Table was marked as crashed");
 call mtr.add_suppression("Checking table: .*");
 create table t1 (a int primary key auto_increment, b int) engine=aria transactional= 1;

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 was marked as crashed");
 call mtr.add_suppression("Checking table: .*");