Merge branch '10.6' into 10.9

mysql-test/suite/binlog/include/database.test

@@ -44,7 +44,9 @@ CREATE TABLE t2(c1 INT);
 let $prefix= `SELECT UUID()`;
 --echo # Create a file in the database directory
 --replace_result $prefix FAKE_FILE
+--disable_ps2_protocol
 eval SELECT 'hello' INTO OUTFILE 'fake_file.$prefix';
+--enable_ps2_protocol
 
 --echo
 --echo # 'DROP DATABASE' will fail if there is any other file in the the

mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test

@@ -68,7 +68,9 @@ INSERT INTO t1 VALUES (1);
 CREATE SEQUENCE s ENGINE=InnoDB;
 
 XA START '2';
+--disable_ps2_protocol
 SELECT NEXT VALUE FOR s;
+--enable_ps2_protocol
 REPLACE INTO t1 SELECT * FROM t1;
 XA END '2';
 XA PREPARE '2';

mysql-test/suite/binlog/t/binlog_stm_row.test

@@ -41,6 +41,7 @@ INSERT INTO t2 VALUES(2);
 --echo # lock that will prevent the source table from being modified.
 --echo #
 
+--disable_ps2_protocol
 --connection con1
 SELECT GET_LOCK('Bug#34306', 120);
 --connection con2
@@ -87,6 +88,7 @@ INSERT INTO t2 VALUES (4);
 SELECT RELEASE_LOCK('Bug#34306');
 --connection con2
 --reap
+--enable_ps2_protocol
 
 --disconnect con1
 --disconnect con2

mysql-test/suite/binlog/t/binlog_unsafe.test

@@ -573,7 +573,9 @@ END|
 
 RESET MASTER;
 CALL proc_insert_delayed();
+--disable_ps2_protocol
 SELECT func_limit();
+--enable_ps2_protocol
 source include/show_binlog_events.inc;
 
 SET @@session.binlog_format = @old_binlog_format;