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/r | |
| 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/r')
4 files changed, 4 insertions, 0 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 # |