From 7aa8b209dfc49686a41949cace8705f5ccd9b648 Mon Sep 17 00:00:00 2001 From: asklavou Date: Tue, 8 Nov 2022 14:26:38 +0000 Subject: [PATCH] MDEV-29866: Add RESET MASTER to clear possible remaining binlog from previous test --- .../binlog/r/binlog_table_map_optional_metadata_binary.result | 1 + .../binlog/r/binlog_table_map_optional_metadata_ucs2.result | 1 + .../binlog/r/binlog_table_map_optional_metadata_utf32.result | 1 + .../binlog/t/binlog_table_map_optional_metadata_binary.test | 1 + .../suite/binlog/t/binlog_table_map_optional_metadata_ucs2.test | 1 + .../suite/binlog/t/binlog_table_map_optional_metadata_utf32.test | 1 + 6 files changed, 6 insertions(+) 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 index 789bc6cd1785c..7514380b715fa 100644 --- 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 index 1b1d2a7972506..a889a2fa82ea2 100644 --- 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 index 6fdda842bac11..e44d0a275d71b 100644 --- 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 index 5997cfd5d273c..29e10ede98a7d 100644 --- 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 index 1e218acdfea4a..8c9e22421b692 100644 --- 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 index c1d449abf2fe5..094de058028b3 100644 --- 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 #