diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-21 10:51:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-21 10:51:10 +0200 |
| commit | 7933367a27b572d5cd02972e00dfe3303d59d5f4 (patch) | |
| tree | f3f912e93c4ca89cb75490dab59c451081c8841d /mysql-test/suite/binlog | |
| parent | 8283948846740a22f96bbe7bccf250708406d5d9 (diff) | |
| parent | bebe193979405b28b15af008621248ed117e54a4 (diff) | |
| download | mariadb-git-7933367a27b572d5cd02972e00dfe3303d59d5f4.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/suite/binlog')
8 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result b/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result index 589570d8300..b11484367b8 100644 --- a/mysql-test/suite/binlog/r/binlog_empty_xa_prepared.result +++ b/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); 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_empty_xa_prepared.test b/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test index 2890c42a087..b127178ebf7 100644 --- a/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test +++ b/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 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 # |