diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 14:36:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-11 14:36:50 +0200 |
| commit | 77c7390fc8cdcf1373c1277ebb129a13575a3a5b (patch) | |
| tree | 37fb97088b58794aded47a5715f84d143b191aea | |
| parent | 42cb400562a24b434f1afba15db60c0262d4f084 (diff) | |
| parent | 4cfb6eddcd1b5d09be706bf558927624586af051 (diff) | |
| download | mariadb-git-77c7390fc8cdcf1373c1277ebb129a13575a3a5b.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result b/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result index a09ad6b97b9..8d0734f9df8 100644 --- a/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result +++ b/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result @@ -12,10 +12,14 @@ c char(32) DEFAULT 'dummy_text', PRIMARY KEY (i) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; insert into t1(i) values(null); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave select * from t1; i c 1 dummy_text insert into t1(i) values(null), (null), (null); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave select * from t1; i c 1 dummy_text @@ -46,10 +50,14 @@ c char(32) DEFAULT 'dummy_text', PRIMARY KEY (i) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; insert into t1(i) values(null); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave select * from t1; i c 1 dummy_text insert into t1(i) values(null), (null), (null); +Warnings: +Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave select * from t1; i c 1 dummy_text diff --git a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test index 817f4f82b43..431fa90c8e2 100644 --- a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test +++ b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test @@ -18,9 +18,17 @@ --connection node_2 SET GLOBAL wsrep_forced_binlog_format='STATEMENT'; +--disable_query_log +call mtr.add_suppression("Unsafe statement written to the binary log"); +--enable_query_log + --connection node_1 SET GLOBAL wsrep_forced_binlog_format='STATEMENT'; +--disable_query_log +call mtr.add_suppression("Unsafe statement written to the binary log"); +--enable_query_log + CREATE TABLE t1 ( i int(11) NOT NULL AUTO_INCREMENT, c char(32) DEFAULT 'dummy_text', |