Merge 10.5 into 10.6

mysql-test/main/myisam_debug.test

@@ -48,12 +48,14 @@ let $wait_condition=
   INFO = "INSERT INTO t1(id) SELECT id  FROM t2";
 --source include/wait_condition.inc
 
+--disable_cursor_protocol
 --enable_prepare_warnings
 SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE STATE = 'wait_in_enable_indexes' AND 
 INFO = "INSERT INTO t1(id) SELECT id  FROM t2" 
 INTO @thread_id;
 --disable_prepare_warnings
+--enable_cursor_protocol
 
 KILL QUERY @thread_id;
 CHECK TABLE t1;