Merge 10.4 into 10.5

Author: dr-m

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

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',