diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 14:39:18 +0200 |
| commit | 1dc2f35598193fc52b79061c286b61f01c617374 (patch) | |
| tree | 30e3972564ec174de0432e429f5f0897bf0b41a7 /mysql-test/suite/binlog | |
| parent | da5d3499353036d39c3a4bcd1f0466f7de3fc263 (diff) | |
| parent | fdf43b5c78c4aeb26efdbef3172746e007ab6f1d (diff) | |
| download | mariadb-git-1dc2f35598193fc52b79061c286b61f01c617374.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/binlog')
8 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index 7071cb3ba43..e4041b16306 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -1,3 +1,4 @@ +reset master; create table t1 (a int, b int) engine=innodb; begin; insert into t1 values (1,2); diff --git a/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result b/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result index 0c3e72133b8..ade3e8acf10 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result +++ b/mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result @@ -1,3 +1,4 @@ +reset master; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# diff --git a/mysql-test/suite/binlog/r/binlog_stm_do_db.result b/mysql-test/suite/binlog/r/binlog_stm_do_db.result index 3d23594135d..c39404aef55 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_do_db.result +++ b/mysql-test/suite/binlog/r/binlog_stm_do_db.result @@ -1,3 +1,4 @@ +RESET MASTER; SET @old_isolation_level= @@session.tx_isolation; SET @@session.tx_isolation= 'READ-COMMITTED'; CREATE DATABASE b42829; diff --git a/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result b/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result index d0132931968..021b5b9af43 100644 --- a/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result +++ b/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result @@ -1,3 +1,4 @@ +reset master; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); select @@innodb_autoinc_lock_mode; @@innodb_autoinc_lock_mode diff --git a/mysql-test/suite/binlog/t/binlog_stm_binlog.test b/mysql-test/suite/binlog/t/binlog_stm_binlog.test index e9c8e0ed874..a87fc8b8463 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_binlog.test +++ b/mysql-test/suite/binlog/t/binlog_stm_binlog.test @@ -3,6 +3,7 @@ let collation=utf8_unicode_ci; --source include/have_collation.inc +reset master; # clear up binlogs # REQUIREMENT # replace_regex should replace output of SHOW BINLOG EVENTS diff --git a/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test b/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test index ae4cab62fec..d277db979fb 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test +++ b/mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test @@ -1,6 +1,6 @@ --source include/not_embedded.inc --source include/have_binlog_format_statement.inc - +reset master; # clear up binlogs --exec $MYSQL_CLIENT_TEST test_datetime_ranges_mdev15289 > $MYSQLTEST_VARDIR/log/binlog_stm_datetime_ranges_mysql_client_test.out.log 2>&1 --let $binlog_file = LAST diff --git a/mysql-test/suite/binlog/t/binlog_stm_do_db.test b/mysql-test/suite/binlog/t/binlog_stm_do_db.test index 991fdef1bea..3ed1734f18d 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_do_db.test +++ b/mysql-test/suite/binlog/t/binlog_stm_do_db.test @@ -37,7 +37,7 @@ -- source include/have_log_bin.inc -- source include/have_innodb.inc -- source include/have_binlog_format_statement.inc - +RESET MASTER; # clear up binlogs SET @old_isolation_level= @@session.tx_isolation; SET @@session.tx_isolation= 'READ-COMMITTED'; diff --git a/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test b/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test index a7d43db4c1b..283862ec3be 100644 --- a/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test +++ b/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test @@ -1,6 +1,6 @@ --source include/have_innodb.inc --source include/have_binlog_format_mixed.inc - +reset master; #clear up binlogs call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); select @@innodb_autoinc_lock_mode; |