Merge branch '10.9' into 10.10

mysql-test/include/check_qep.inc

@@ -30,7 +30,9 @@
 
 flush status;
 eval EXPLAIN $query;
+--disable_ps2_protocol
 eval $query;
+--enable_ps2_protocol
 
 let $cost=
  query_get_value(SHOW STATUS LIKE 'Last_query_cost', Value, 1);

mysql-test/include/column_compression_rpl.inc

@@ -1,4 +1,6 @@
 
+--disable_ps2_protocol
+
 --connection slave
 
 SET @saved_slave_type_conversions = @@slave_type_conversions;
@@ -257,4 +259,4 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 DROP TABLE t1,t2;
 --sync_slave_with_master
 
-
+--enable_ps2_protocol

mysql-test/include/commit.inc

@@ -6,6 +6,7 @@
 ## - $engine_type should be set
 ##
 
+--disable_ps2_protocol
 set sql_mode=no_engine_substitution;
 eval set default_storage_engine = $engine_type;
 set autocommit=1;
@@ -787,3 +788,4 @@ call p_verify_status_increment(2, 0, 2, 0);
 drop table t1, t2, t3;
 drop procedure p_verify_status_increment;
 drop function f1;
+--enable_ps2_protocol

mysql-test/include/ctype_E05C.inc

@@ -76,6 +76,15 @@ INSERT INTO t1 VALUES (_BINARY'\\''
 SELECT a, HEX(a) FROM t1;
 DROP TABLE t1;
 
+#
+# test how strings are written into view's frm
+#
+disable_view_protocol;
+create view v1 as select hex('<27>\'), hex('<EFBFBD>\t');
+select * from v1;
+drop view v1;
+enable_view_protocol;
+
 # Checking that with character_set_client=binary 0x5C in 0xE05C
 # is treated as escape rather than the second byte of a multi-byte character,
 # even if character_set_connection is big5/cp932/gbk/sjis.
@@ -109,5 +118,5 @@ SELECT HEX(a) FROM t1;
 DROP TABLE t1;
 --enable_view_protocol
 
---echo # Start of ctype_E05C.inc
+--echo # End of ctype_E05C.inc
 

mysql-test/include/ctype_numconv.inc

@@ -463,6 +463,7 @@ select * from t1;
 show create table t1;
 drop table t1;
 
+--disable_ps2_protocol
 # Ensure that row_count() value is reset after drop table.
 select 1;
 select hex(concat(row_count()));
@@ -474,6 +475,7 @@ select hex(concat(found_rows()));
 create table t1 as select concat(found_rows()) as c1;
 show create table t1;
 drop table t1;
+--enable_ps2_protocol
 
 create table t1 as select concat(uuid_short()) as c1;
 show create table t1;

mysql-test/include/ctype_unicode_ws_bmp.inc

@@ -10,6 +10,7 @@ SELECT
 FROM
   seq_0_to_65535', @@character_set_connection, @@collation_connection);
 
+--disable_service_connection
 SELECT COLLATION(c) FROM v_bmp LIMIT 1;
 
 SELECT HEX(codepoint) FROM v_bmp WHERE HEX(WEIGHT_STRING(c))='FFFD';
@@ -23,4 +24,6 @@ SELECT codepoint_hex4,HEX(WEIGHT_STRING(c))
 FROM v_bmp
 WHERE codepoint_hex4<>HEX(WEIGHT_STRING(c));
 
+--enable_service_connection
+
 DROP VIEW v_bmp;

mysql-test/include/diff_tables.inc

@@ -165,9 +165,11 @@ while ($_dt_tables)
 
   # Now that we have the comma-separated list of columns, we can write
   # the table to a file.
+  --disable_ps2_protocol
   --let $_dt_outfile= `SELECT @@datadir`
   --let $_dt_outfile= $_dt_outfile/diff_table-$_dt_connection-$_dt_database-$_dt_table
   eval SELECT * INTO OUTFILE '$_dt_outfile' FROM $_dt_database.$_dt_table ORDER BY `$_dt_column_list`;
+  --enable_ps2_protocol
 
   # Compare files.
   if ($_dt_prev_outfile)

mysql-test/include/expect_qep.inc

@@ -30,7 +30,9 @@
 
 flush status;
 eval EXPLAIN $query;
+--disable_ps2_protocol
 eval $query;
+--enable_ps2_protocol
 
 let $best_cost=
   query_get_value(SHOW STATUS LIKE 'Last_query_cost', Value, 1);

mysql-test/include/explain_utils.inc

@@ -26,6 +26,7 @@
 --echo # query:  $query
 --echo # select: $select
 --echo #
+--disable_ps2_protocol
 --disable_view_protocol
 if ($select) {
 --enable_prepare_warnings
@@ -164,3 +165,4 @@ SHOW STATUS WHERE (Variable_name LIKE 'Sort%' OR
 
 --echo
 --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_ps2_protocol
 SELECT 1 INTO OUTFILE 't3.dat' FROM dual;
 
 SELECT NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
@@ -831,6 +832,7 @@ INTO OUTFILE 't4.dat'
 FROM dual;
 
 SELECT 1, 2 INTO OUTFILE 't5.dat' FROM dual;
+--enable_ps2_protocol
 
 --echo # Mon Aug 1 15:11:19 2011 UTC
 SET TIMESTAMP = 1312211479.918273;
@@ -929,9 +931,11 @@ remove_file $MYSQLD_DATADIR/test/t5.dat;
 --echo # Mon Aug 1 15:11:19 2011 UTC
 SET TIMESTAMP = 1312211479.089786;
 
+--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
 
 --echo # Too short row
 

mysql-test/include/grant_cache.inc

@@ -54,6 +54,8 @@ set GLOBAL query_cache_type=ON;
 set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 
+--disable_ps2_protocol
+
 reset query cache;
 flush status;
 connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
@@ -171,6 +173,8 @@ show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 show status like "Qcache_not_cached";
 
+--enable_ps2_protocol
+
 # Cleanup
 
 connection root;

mysql-test/include/icp_tests.inc

@@ -876,6 +876,7 @@ SET optimizer_switch=@save_optimizer_switch;
 
 DROP TABLE t1,t2;
 
+--disable_ps2_protocol
 --echo # check "Handler_pushed" status varuiables
 CREATE TABLE t1 (
   c1 CHAR(1),
@@ -897,6 +898,7 @@ SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
 show status like "Handler_icp%";
 
 DROP TABLE t1;
+--enable_ps2_protocol
 
 #
 # MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == len

mysql-test/include/query_cache.inc

@@ -14,6 +14,7 @@
 #               old name was innodb_cache.test
 #               main code went into include/query_cache.inc
 #
+--disable_ps2_protocol
 --disable_view_protocol
 SET global query_cache_type=ON;
 SET local query_cache_type=ON;
@@ -192,3 +193,4 @@ drop table t2;
 
 SET global query_cache_type=default;
 --enable_view_protocol
+--enable_ps2_protocol

mysql-test/include/query_cache_partitions.inc

@@ -44,13 +44,14 @@ flush status;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
-
+--disable_ps2_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;
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
+--enable_ps2_protocol
 
 drop table t1;
 
@@ -79,12 +80,14 @@ flush status;
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
+--disable_ps2_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;
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
+--enable_ps2_protocol
 
 drop table t1;
 
@@ -114,6 +117,7 @@ INSERT INTO t1 VALUES (1, now(), 0);
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
 
+--disable_ps2_protocol
 BEGIN;
 UPDATE `t1` SET `cool` = 1 WHERE `id` = 1;
 SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
@@ -126,6 +130,7 @@ SELECT cool FROM `t1` WHERE (`t1`.id = 1) LIMIT 1;
 
 show status like "Qcache_queries_in_cache";
 show status like "Qcache_hits";
+--enable_ps2_protocol
 
 drop table t1;
 

mysql-test/include/query_cache_sql_prepare.inc

@@ -23,6 +23,8 @@
 set GLOBAL query_cache_type=ON;
 set LOCAL query_cache_type=ON;
 
+--disable_ps2_protocol
+
 connect (con1,localhost,root,,test,$MASTER_MYPORT,);
 connection default;
 
@@ -252,6 +254,7 @@ set @a=10;
 execute stmt1 using @a;
 show status like 'Qcache_hits';
 
+--enable_ps2_protocol
 
 drop table t1;
 disconnect con1;

mysql-test/include/test_outfile.inc

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

mysql-test/include/type_temporal_zero_default.inc

@@ -34,8 +34,10 @@ SET sql_mode=DEFAULT;
 --eval CREATE TABLE t1 (a $type DEFAULT $defval, b $type DEFAULT $defval)
 --eval INSERT INTO t1 VALUES (DEFAULT,DEFAULT);
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--disable_ps2_protocol
 --eval SELECT a INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/mdev-7824.txt' FROM t1
 DELETE FROM t1;
+--enable_ps2_protocol
 SET sql_mode=TRADITIONAL;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error ER_INVALID_DEFAULT_VALUE_FOR_FIELD

mysql-test/include/wait_until_connected_again.inc

@@ -11,7 +11,7 @@ let $counter= 5000;
 let $mysql_errno= 9999;
 while ($mysql_errno)
 {
-  --error 0,ER_ACCESS_DENIED_ERROR,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013
+  --error 0,ER_ACCESS_DENIED_ERROR,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013,HA_ERR_NO_ENCRYPTION
   select 1;
 
   dec $counter;
@@ -33,6 +33,10 @@ while ($mysql_errno)
   {
     let $mysql_errno=0;
   }
+  if ($mysql_errno == 199)
+  {
+    let $mysql_errno=0;
+  }
   if ($mysql_errno > 0)
   {
     --sleep 0.1

mysql-test/include/write_var_to_file.inc

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