Merge 10.6 into 10.11

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/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;