MDEV-39318 MTR: fix test failures when running with --ssl

mysql-test/main/information_schema.test

@@ -1339,7 +1339,7 @@ where state='User sleep' and
 info='select * from information_schema.tables where 1=sleep(100000)';
 --source include/wait_condition.inc
 connection conn1;
---error 2013,ER_CONNECTION_KILLED
+--error 2013,2026,ER_CONNECTION_KILLED
 reap;
 connection default;
 disconnect conn1;
@@ -1363,7 +1363,7 @@ where state='User sleep' and
 info='select * from information_schema.columns where 1=sleep(100000)';
 --source include/wait_condition.inc
 connection conn1;
---error 2013,ER_CONNECTION_KILLED
+--error 2013,2026,ER_CONNECTION_KILLED
 reap;
 connection default;
 disconnect conn1;

mysql-test/main/kill_debug.test

@@ -52,7 +52,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 SET DEBUG_SYNC = 'RESET';
 
 connection con1;
---error 1053,2006,2013,5014
+--error 1053,2006,2013,2026,5014
 SELECT 1;
 
 --enable_reconnect
@@ -91,7 +91,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 SET DEBUG_SYNC = 'RESET';
 
 connection con1;
---error 1053,2006,2013,5014
+--error 1053,2006,2013,2026,5014
 SELECT 1;
 enable_reconnect;
 SELECT 1;
@@ -138,7 +138,7 @@ KILL @id;
 SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 
 connection con1;
---error 1317,1053,2006,2013,5014
+--error 1317,1053,2006,2013,2026,5014
 reap;
 SELECT 1;
 
@@ -283,7 +283,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
 connection con1;
 --echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
 --echo # depending on the timing of close of the connection socket
---error 1053,2006,2013,5014
+--error 1053,2006,2013,2026,5014
 SELECT 1;
 --enable_reconnect
 SELECT 1;

mysql-test/main/loadxml.test

@@ -83,7 +83,7 @@ connection default;
 connection addconroot;
 # Read response from connection to avoid packets out-of-order when disconnecting
 # Note, that connection can already be dead due to previously issued kill
---error 0,2013
+--error 0,2013,2026
 --reap
 disconnect addconroot;
 connection default;

mysql-test/main/lock_kill.test

@@ -18,7 +18,7 @@ eval KILL $conid;
 --enable_query_log
 --connection con1
 --disable_warnings
---error 0,2006,2013,ER_CONNECTION_KILLED
+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
 reap;
 --enable_warnings
 --connection default
@@ -38,7 +38,7 @@ eval KILL $conid;
 --enable_query_log
 --connection con1
 --disable_warnings
---error 0,2006,2013,ER_CONNECTION_KILLED
+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
 reap;
 --enable_warnings
 --connection default

mysql-test/main/mdev375.result

@@ -17,7 +17,7 @@ connect  con2,localhost,root,,;
 SELECT 2;
 2
 2
-ERROR HY000: Too many connections
+Got one of the listed errors
 connection default;
 SELECT 0;
 0

mysql-test/main/mdev375.test

@@ -24,7 +24,7 @@ SELECT 1;
 --connect (con2,localhost,root,,)
 SELECT 2;
 --disable_query_log
---error ER_CON_COUNT_ERROR
+--error ER_CON_COUNT_ERROR,2002
 --connect (con3,localhost,root,,)
 --enable_query_log
 

mysql-test/main/processlist.test

@@ -102,7 +102,7 @@ let $wait_condition=select count(*)=0 from information_schema.processlist
 where state='User sleep' and info='SELECT SLEEP(1000)';
 --source include/wait_condition.inc
 connection conn1;
---error 2013,ER_CONNECTION_KILLED
+--error 2013,2026,ER_CONNECTION_KILLED
 reap;
 connection default;
 disconnect conn1;

mysql-test/main/quick_select_4161.test

@@ -43,7 +43,7 @@ eval kill $id;
 set debug_sync='now signal done';
 
 connection killee;
---error 1053,1927,2006,2013
+--error 1053,1927,2006,2013,2026
 reap;
 
 connection default;

mysql-test/suite/innodb/r/innodb-blob.result

@@ -45,7 +45,7 @@ INSERT INTO t2 VALUES (42);
 disconnect con1;
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to server during query
+Got one of the listed errors
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -103,7 +103,7 @@ connection con2;
 # restart
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to server during query
+Got one of the listed errors
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
@@ -133,7 +133,7 @@ UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2
 # restart
 disconnect con2;
 connection default;
-ERROR HY000: Lost connection to server during query
+Got one of the listed errors
 CHECK TABLE t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK

mysql-test/suite/innodb/t/innodb-blob.test

@@ -77,7 +77,7 @@ disconnect con1;
 disconnect con2;
 connection default;
 # This connection should notice the crash as well.
---error 2013
+--error 2013,2026
 reap;
 
 --enable_reconnect
@@ -153,7 +153,7 @@ connection con2;
 disconnect con2;
 connection default;
 # This connection should notice the crash as well.
---error 2013
+--error 2013,2026
 reap;
 
 --enable_reconnect
@@ -193,7 +193,7 @@ WHERE state = 'debug sync point: after_row_upd_extern';
 disconnect con2;
 connection default;
 # This connection should notice the crash as well.
---error 2013
+--error 2013,2026
 reap;
 
 --enable_reconnect

mysql-test/suite/perfschema/include/show_aggregate.inc

@@ -8,10 +8,19 @@
 --echo # Global results
 --echo #=================
 USE test;
+# Under --ssl, Ssl_cipher_list exceeds VARCHAR(1024) in PFS tables, causing
+# ER_DATA_TOO_LONG during multi-table UPDATE scans.  Temporarily relax
+# STRICT_TRANS_TABLES so the truncation is a warning, not an error.
+--disable_query_log
+SET @save_sql_mode= @@sql_mode;
+SET sql_mode= REPLACE(@@sql_mode, 'STRICT_TRANS_TABLES', '');
+--enable_query_log
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.global_status sg
   SET sr.stop = sg.variable_value
   WHERE sr.variable_name = sg.variable_name
     AND sg.variable_name IN ('handler_delete', 'handler_rollback');
+--enable_warnings
 --echo #
 --echo # Global deltas: END - START.
 UPDATE test.status_results sr
@@ -25,25 +34,31 @@ UPDATE test.status_results sr
 --echo # Status by thread
 --echo #=================
 --echo # Thread results from CON1.
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   SET sr.t1 = sbt.variable_value
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con1_id;
+--enable_warnings
 --echo #
 --echo # Thread results from CON2.
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   SET sr.t2 = sbt.variable_value
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con2_id;
+--enable_warnings
 --echo #
 --echo # Thread results from CON3.
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   SET sr.t3 = sbt.variable_value
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con3_id;
+--enable_warnings
 --echo #
 --echo # Thread totals for 3 connections.
 UPDATE test.status_results sr
@@ -53,25 +68,31 @@ UPDATE test.status_results sr
 --echo # Status by user
 --echo #=================
 --echo # User1
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_user sbu
   SET sr.u1 = sbu.variable_value
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user1');
+--enable_warnings
 --echo #
 --echo # User2
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_user sbu
   SET sr.u2 = sbu.variable_value
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user2');
+--enable_warnings
 --echo #
 --echo # User3
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_user sbu
   SET sr.u3 = sbu.variable_value
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user3');
+--enable_warnings
 --echo #
 --echo # Status totals for 3 users.
 UPDATE test.status_results sr
@@ -82,11 +103,13 @@ UPDATE test.status_results sr
 --echo #===========================
 --echo #
 --echo # host1 = localhost
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_host sbh
   SET sr.h1 = sbh.variable_value
   WHERE sr.variable_name = sbh.variable_name
     AND sbh.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbh.host IN ('localhost');
+--enable_warnings
 --echo #
 --echo # Status totals for 'localhost' only.
 UPDATE test.status_results sr
@@ -96,30 +119,40 @@ UPDATE test.status_results sr
 --echo # Status by account
 --echo #==================
 --echo # User1@localhost
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_account sba
   SET sr.a1 = sba.variable_value
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user1');
+--enable_warnings
 --echo #
 --echo # User2@localhost
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_account sba
   SET sr.a2 = sba.variable_value
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user2');
+--enable_warnings
 --echo #
 --echo # User3@localhost
+--disable_warnings
 UPDATE test.status_results sr, performance_schema.status_by_account sba
   SET sr.a3 = sba.variable_value
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user3');
+--enable_warnings
 --echo #
 --echo #
 --echo # Status totals for 3 accounts.
 UPDATE test.status_results sr
   SET sr.acct = sr.a1 + sr.a2 + sr.a3;
 
+--disable_query_log
+SET sql_mode= @save_sql_mode;
+--enable_query_log
+
 #--echo DEBUG
 #SELECT * FROM test.status_results;

mysql-test/suite/perfschema/t/nesting.test

@@ -13,6 +13,14 @@
 --source include/have_wsrep.inc
 --source ../include/wait_for_pfs_thread_count.inc
 
+# SSL/TLS bypasses PFS socket I/O instrumentation
+# (SSL_read/SSL_write instead of recv/send)
+--let $have_ssl= `SELECT VARIABLE_VALUE != '' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'`
+if ($have_ssl)
+{
+  --skip Socket I/O not available over SSL/TLS
+}
+
 --disable_query_log
 
 create user user1@localhost;

mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test

@@ -22,6 +22,14 @@
 # Wait for any clients from previous tests to disconnect
 --source ../include/wait_for_pfs_thread_count.inc
 
+# SSL/TLS bypasses PFS socket I/O instrumentation
+# (SSL_read/SSL_write instead of recv/send)
+--let $have_ssl= `SELECT VARIABLE_VALUE != '' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'`
+if ($have_ssl)
+{
+  --skip Socket I/O not available over SSL/TLS
+}
+
 # The values in the performance_schema tables depend on how much communication
 # happens per SQL statement within our MTR tests. And there is a significant
 # difference between standard statement execution and execution via

mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test

@@ -33,6 +33,14 @@
 --source include/no_valgrind_without_big.inc
 --source include/have_perfschema.inc
 
+# SSL/TLS bypasses PFS socket I/O instrumentation
+# (SSL_read/SSL_write instead of recv/send)
+--let $have_ssl= `SELECT VARIABLE_VALUE != '' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'`
+if ($have_ssl)
+{
+  --skip Socket I/O not available over SSL/TLS
+}
+
 # The values in the performance_schema tables depend on how much communication
 # happens per SQL statement within our MTR tests. And there is a significant
 # difference between standard statement execution and execution via

mysql-test/suite/perfschema/t/threads_mysql.test

@@ -31,6 +31,8 @@ SET GLOBAL event_scheduler = OFF;
 #    find a correcet row for our current thread but the content will differ.
 #    Therefore we have to disable this protocol for the next statement.
 --disable_ps_protocol
+# Normalize connection_type: SSL/TLS -> Socket (--ssl compatibility)
+--replace_result SSL/TLS Socket
 SELECT name, type, processlist_user, processlist_host, processlist_db,
        processlist_command, processlist_info, connection_type,
        IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')