Merge 10.5 into 10.6

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

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

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

@@ -15,6 +15,7 @@ connect(con3,localhost,root,,test);
 
 # Get Initial status measurements
 --connection default
+--disable_cursor_protocol
 SELECT variable_value INTO @group_commits FROM information_schema.global_status
  WHERE variable_name = 'binlog_group_commits';
 SELECT variable_value INTO @group_commit_trigger_count FROM information_schema.global_status
@@ -23,6 +24,7 @@ SELECT variable_value INTO @group_commit_trigger_timeout FROM information_schema
  WHERE variable_name = 'binlog_group_commit_trigger_timeout';
 SELECT variable_value INTO @group_commit_trigger_lock_wait FROM information_schema.global_status
  WHERE variable_name = 'binlog_group_commit_trigger_lock_wait';
+--enable_cursor_protocol
 
 # Note: binlog_group_commits is counted at the start of the group and group_commit_trigger_* is
 # counted near when the groups its finalised.

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

@@ -7,7 +7,9 @@ CREATE TABLE t (a TEXT);
 # events of interest are guaranteed to stay in 000001 log
 RESET MASTER;
 --eval INSERT INTO t SET a=repeat('a', 1024)
+--disable_cursor_protocol
 SELECT a into @a from t;
+--enable_cursor_protocol
 FLUSH LOGS;
 DELETE FROM t;