Merge branch '10.5' into 10.6

mysql-test/suite/rpl/t/rpl_misc_functions.test

@@ -26,7 +26,9 @@ insert into t1 values(3, 0, 0, 0, password('does_this_work?'));
 --disable_warnings
 insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?'));
 --enable_warnings
+--disable_ps2_protocol
 select * into outfile 'rpl_misc_functions.outfile' from t1;
+--enable_ps2_protocol
 let $MYSQLD_DATADIR= `select @@datadir`;
 sync_slave_with_master;
 create temporary table t2 like t1; 
@@ -91,8 +93,10 @@ INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 
 --enable_prepare_warnings
 # Dump table on slave
+--disable_ps2_protocol
 select * from t1 into outfile "../../tmp/t1_slave.txt";
 --disable_prepare_warnings
+--enable_ps2_protocol
 
 # Load data from slave into temp table on master
 connection master;