diff options
| author | asklavou <angelique.sklavounos@mariadb.com> | 2022-11-08 14:26:38 +0000 |
|---|---|---|
| committer | asklavou <angelique.sklavounos@mariadb.com> | 2022-11-09 17:36:42 +0000 |
| commit | 7aa8b209dfc49686a41949cace8705f5ccd9b648 (patch) | |
| tree | 65a9a35fd6318d5b52ba853148d587f2aea91a6a | |
| parent | e616c9a0ef167436c0050f2515304c0aa7da231d (diff) | |
| download | mariadb-git-7aa8b209dfc49686a41949cace8705f5ccd9b648.tar.gz | |
MDEV-29866: Add RESET MASTER to clear possible remaining binlog from previous test
6 files changed, 6 insertions, 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 index 789bc6cd178..7514380b715 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 1b1d2a79725..a889a2fa82e 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 6fdda842bac..e44d0a275d7 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 5997cfd5d27..29e10ede98a 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 1e218acdfea..8c9e22421b6 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 c1d449abf2f..094de058028 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 # |