Merge 10.5 into 10.6

mysql-test/include/commit.inc

@@ -258,8 +258,10 @@ select * from t2;
 insert into t2 (a) values (1025);
 
 --replace_result $MYSQLTEST_VARDIR ..
+--disable_cursor_protocol
 --error ER_DUP_ENTRY
 eval select f2(25) into outfile "$MYSQLTEST_VARDIR/tmp/dml.out" from t1;
+--enable_cursor_protocol
 select * from t2;
 rollback;
 select * from t2;
@@ -279,8 +281,10 @@ select * from t2;
 --echo =======================================================================
 
 insert into t2 (a) values (1027);
+--disable_cursor_protocol
 --error ER_DUP_ENTRY
 select f2(27) into @foo;
+--enable_cursor_protocol
 select * from t2;
 rollback;
 select * from t2;

mysql-test/include/ctype_like_range_f1f2.inc

@@ -17,6 +17,8 @@ INSERT INTO t1 (a, b) VALUES (2, repeat(0xF1F2,10));
 INSERT INTO t1 (a, b) VALUES (3, repeat(0xF1F2,11));
 INSERT INTO t1 (a, b) VALUES (4, repeat(0xF1F2,12));
 
+#enable after fix MDEV-31512
+--disable_cursor_protocol
 #check after fix MDEV-29290
 --disable_view_protocol
 # Check pattern (important for ucs2, utf16, utf32)
@@ -24,5 +26,6 @@ SELECT hex(concat(repeat(0xF1F2, 10), '%'));
 
 --echo 3 rows expected
 SELECT a, hex(b), c FROM t1 WHERE b LIKE concat(repeat(0xF1F2,10), '%');
-DROP TABLE t1;
+--enable_cursor_protocol
 --enable_view_protocol
+DROP TABLE t1;

mysql-test/include/ctype_numconv.inc

@@ -1646,7 +1646,10 @@ SELECT GROUP_CONCAT(IF(a,a,'')) FROM t1;
 SELECT GROUP_CONCAT(CASE WHEN a THEN a ELSE '' END) FROM t1;
 --disable_view_protocol
 --enable_metadata
+#Check after fix MDEV-31512
+--disable_cursor_protocol
 SELECT COALESCE(a,'') FROM t1 GROUP BY 1;
+--enable_cursor_protocol
 --disable_metadata
 --enable_view_protocol
 --echo # All columns must be VARCHAR(9) with the same length:

mysql-test/include/diff_tables.inc

@@ -168,7 +168,9 @@ while ($_dt_tables)
   --disable_ps2_protocol
   --let $_dt_outfile= `SELECT @@datadir`
   --let $_dt_outfile= $_dt_outfile/diff_table-$_dt_connection-$_dt_database-$_dt_table
+  --disable_cursor_protocol
   eval SELECT * INTO OUTFILE '$_dt_outfile' FROM $_dt_database.$_dt_table ORDER BY `$_dt_column_list`;
+  --enable_cursor_protocol
   --enable_ps2_protocol
 
   # Compare files.

mysql-test/include/explain_utils.inc

@@ -28,6 +28,7 @@
 --echo #
 --disable_ps2_protocol
 --disable_view_protocol
+--disable_cursor_protocol
 if ($select) {
 --enable_prepare_warnings
 --disable_query_log
@@ -164,5 +165,6 @@ SHOW STATUS WHERE (Variable_name LIKE 'Sort%' OR
 --enable_query_log
 
 --echo
+--enable_cursor_protocol
 --enable_view_protocol
 --enable_ps2_protocol

mysql-test/include/function_defaults.inc

@@ -824,6 +824,7 @@ eval CREATE TABLE t2 (
   i $datetime DEFAULT $current_timestamp ON UPDATE $current_timestamp NOT NULL
 );
 
+--disable_cursor_protocol
 --disable_ps2_protocol
 SELECT 1 INTO OUTFILE 't3.dat' FROM dual;
 
@@ -833,6 +834,7 @@ FROM dual;
 
 SELECT 1, 2 INTO OUTFILE 't5.dat' FROM dual;
 --enable_ps2_protocol
+--enable_cursor_protocol
 
 --echo # Mon Aug 1 15:11:19 2011 UTC
 SET TIMESTAMP = 1312211479.918273;
@@ -931,11 +933,13 @@ remove_file $MYSQLD_DATADIR/test/t5.dat;
 --echo # Mon Aug 1 15:11:19 2011 UTC
 SET TIMESTAMP = 1312211479.089786;
 
+--disable_cursor_protocol
 --disable_ps2_protocol
 SELECT 1 INTO OUTFILE "file1.dat" FROM dual;
 SELECT NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
  INTO OUTFILE "file2.dat" FROM dual;
 --enable_ps2_protocol
+--enable_cursor_protocol
 
 --echo # Too short row
 

mysql-test/include/grant_cache.inc

@@ -55,6 +55,7 @@ set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 
 --disable_ps2_protocol
+--disable_cursor_protocol
 
 reset query cache;
 flush status;
@@ -173,6 +174,7 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 show status like "Qcache_not_cached";
 
+--enable_cursor_protocol
 --enable_ps2_protocol
 
 # Cleanup

mysql-test/include/have_tlsv13.inc

@@ -0,0 +1,10 @@
+--disable_query_log
+connect (ssl_connection,localhost,root,,,,,SSL);
+
+if (`SELECT VARIABLE_VALUE NOT LIKE 'TLSv1.3' FROM information_schema.SESSION_STATUS WHERE VARIABLE_NAME = 'ssl_version'`) {
+  skip Needs TLSv1.3;
+}
+
+disconnect ssl_connection;
+connection default;
+--enable_query_log

mysql-test/include/ps_conv.inc

@@ -206,6 +206,7 @@ execute full_info ;
 --error 1064
 prepare stmt1 from "select ? := c1 from t9 where c1= 1" ;
 
+--disable_cursor_protocol
 --disable_query_log
 select '------ select column, .. into @parm,.. ------' as test_sequence ;
 --enable_query_log
@@ -243,6 +244,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08,
      @arg17, @arg18, @arg19, @arg20, @arg21, @arg22, @arg23, @arg24,
      @arg25, @arg26, @arg27, @arg28, @arg29, @arg30, @arg31, @arg32
 from t9 where c1= ?" ;
+--enable_cursor_protocol
 set @my_key= 1 ;
 execute stmt1 using @my_key ;
 # get as much information about the parameters as possible

mysql-test/include/query_cache.inc

@@ -28,6 +28,7 @@ drop table if exists t1,t2,t3;
 set @save_query_cache_size = @@global.query_cache_size;
 set GLOBAL query_cache_size = 1355776;
 
+--disable_cursor_protocol
 #
 # Without auto_commit.
 #
@@ -86,6 +87,7 @@ show status like "Qcache_hits";
 commit;
 show status like "Qcache_queries_in_cache";
 drop table t3,t2,t1;
+--enable_cursor_protocol
 
 eval CREATE TABLE t1 (id int(11) NOT NULL auto_increment, PRIMARY KEY (id))$partitions_id;
 select count(*) from t1;
@@ -128,6 +130,7 @@ connection default;
 # This should be 'YES'.
 SHOW VARIABLES LIKE 'have_query_cache';
 
+--disable_cursor_protocol
 SET GLOBAL query_cache_size = 204800;
 flush status;
 SET @@autocommit=1;
@@ -190,6 +193,7 @@ disconnect connection1;
 connection default;
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+--enable_cursor_protocol
 
 SET global query_cache_type=default;
 --enable_view_protocol

mysql-test/include/query_cache_partitions.inc

@@ -45,9 +45,11 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
 --disable_ps2_protocol
+--disable_cursor_protocol
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
+--enable_cursor_protocol
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
@@ -81,9 +83,11 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
 --disable_ps2_protocol
+--disable_cursor_protocol
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
+--enable_cursor_protocol
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
@@ -118,6 +122,7 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
 --disable_ps2_protocol
+--disable_cursor_protocol
 BEGIN;
 UPDATE `t1` SET `cool` = 1 WHERE `id` = 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
@@ -127,6 +132,7 @@ BEGIN;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 ROLLBACK;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
+--enable_cursor_protocol
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";

mysql-test/include/test_outfile.inc

@@ -1,3 +1,5 @@
+--disable_cursor_protocol
 --disable_ps2_protocol
 eval select "Outfile OK" into outfile "$MYSQLTEST_VARDIR/tmp/outfile.test";
 --enable_ps2_protocol
+--enable_cursor_protocol

mysql-test/include/type_temporal_zero_default.inc

@@ -35,7 +35,9 @@ SET sql_mode=DEFAULT;
 --eval INSERT INTO t1 VALUES (DEFAULT,DEFAULT);
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --disable_ps2_protocol
+--disable_cursor_protocol
 --eval SELECT a INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/mdev-7824.txt' FROM t1
+--enable_cursor_protocol
 DELETE FROM t1;
 --enable_ps2_protocol
 SET sql_mode=TRADITIONAL;

mysql-test/include/write_var_to_file.inc

@@ -46,9 +46,11 @@ if (`SELECT LENGTH(@@secure_file_priv) > 0`)
   --let $_wvtf_suffix= `SELECT UUID()`
   --let $_wvtf_tmp_file= $MYSQLTEST_VARDIR/_wvtf_$_wvtf_suffix
 
+  --disable_cursor_protocol
   --disable_ps2_protocol
   --eval SELECT '$write_var' INTO DUMPFILE '$_wvtf_tmp_file'
   --enable_ps2_protocol
+  --enable_cursor_protocol
   --copy_file $_wvtf_tmp_file $write_to_file
   --remove_file $_wvtf_tmp_file
 }