Merge 10.11 into 11.4

Author: dr-m

mysql-test/main/servers.result

@@ -53,6 +53,7 @@ CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1');
 ALTER TABLE mysql.servers ENGINE=innodb;
 FLUSH PRIVILEGES;
 drop server s1;
+ALTER TABLE mysql.servers ENGINE=Aria;
 #
 # MDEV-35622 SEGV, ASAN use-after-poison when reading system table with less than expected number of columns
 # MDEV-37777 upgrade from MySQL 5.7 regression, mysql.servers invalid structure

mysql-test/main/servers.test

@@ -53,6 +53,8 @@ CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1');
 ALTER TABLE mysql.servers ENGINE=innodb;
 FLUSH PRIVILEGES;
 drop server s1;
+# Restore the table back to original engine, to not disrupt following tests.
+ALTER TABLE mysql.servers ENGINE=Aria;
 
 --echo #
 --echo # MDEV-35622 SEGV, ASAN use-after-poison when reading system table with less than expected number of columns

mysql-test/main/ssl.result

@@ -1,5 +1,5 @@
 connect  ssl_con,localhost,root,,,,,SSL;
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 variable_name
 Ssl_cipher
 Ssl_cipher_list

mysql-test/main/ssl.test

@@ -12,9 +12,12 @@
 --source include/default_charset.inc
 --source include/have_perfschema.inc
 
+let $default_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+
 connect (ssl_con,localhost,root,,,,,SSL);
 
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+let $ssl_con_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+evalp select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 
 # Check ssl turned on
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';

mysql-test/main/xa.test

@@ -5,7 +5,7 @@
 --source include/not_embedded.inc
 
 # Save the initial number of concurrent sessions
---source include/count_sessions.inc
+let $count_sessions=1;
 
 call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 --disable_query_log
@@ -694,7 +694,6 @@ xa rollback 'test1';
 xa recover;
 drop table asd;
 disconnect con_tmp;
---source include/wait_until_disconnected.inc
 connection default;
 
 --echo # MDEV-30978: a read-only server should still allow the commit of
@@ -718,7 +717,6 @@ xa rollback '2';
 
 --echo # Read-only disconnect case
 
---source include/count_sessions.inc
 connect (con1_ro,localhost,root,,);
 xa start '3';
 select 0;
@@ -732,7 +730,6 @@ xa recover;
 --error ER_XA_RBROLLBACK
 xa commit '3';
 
---source include/count_sessions.inc
 connect (con2_ro,localhost,root,,);
 xa start '4';
 select 0;
@@ -781,6 +778,7 @@ xa end 'r:foo';
 xa prepare 'r:foo';
 disconnect con1;
 connection default;
+--source include/wait_until_count_sessions.inc
 xa recover;
 
 xa start 'r:bar';

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

@@ -18,7 +18,23 @@ ELSE 'SERIALIZABLE' END`;
 eval SET TRANSACTION ISOLATION LEVEL $tx_isolation;
 BEGIN;
 DELETE FROM t1 WHERE b='2' AND c=2;
---replace_regex /.*(\d+ lock struct...), heap size \d+(, \d+ row lock...).*/\1\2/
+# The SHOW ENGINE INNODB STATUS looks like this:
+#
+# ...
+# +LIST OF TRANSACTIONS FOR EACH SESSION:
+# +---TRANSACTION (0x7f1e08168300), not started
+# +0 lock struct(s), heap size 1144, 0 row lock(s)
+# +---TRANSACTION (0x7f1e08167780), not started
+# +0 lock struct(s), heap size 1144, 0 row lock(s)
+# +---TRANSACTION 25, ACTIVE 0 sec
+# +2 lock struct(s), heap size 1144, 1 row lock(s)
+# ...
+#
+# We want the lock struct(s) and row lock(s) of the ACTIVE transaction, but
+# not of any inactive ones. Note the use of non-greedy match ".*?", so that
+# we get the values for the ACTIVE transaction, not the last values in the
+# list.
+--replace_regex /.*---TRANSACTION \d+, ACTIVE.*?(\d+ lock struct...), heap size \d+(, \d+ row lock...).*/\1\2/
 SHOW ENGINE INNODB STATUS;
 ROLLBACK;