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

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

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result b/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
 #

diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result b/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
 #

diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result b/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
 #

diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_binary.test b/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 #

diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test b/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 #

diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata_utf32.test b/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 #