Merge 10.6 into 10.11

mysql-test/suite/innodb/r/innodb-wl5522-debug.result

@@ -456,7 +456,7 @@ restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug=@saved_debug_dbug;
 SET SESSION debug_dbug="+d,ib_import_open_tablespace_failure";
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Got error 42 'Tablespace not found' from ./test/t1.ibd
+ERROR HY000: Got error 41 'Tablespace not found' from ./test/t1.ibd
 SET SESSION debug_dbug=@saved_debug_dbug;
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_check_bitmap_failure";

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

@@ -3,6 +3,10 @@
 --source include/have_debug_sync.inc
 --source include/not_embedded.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Two parallel connection with autoinc column after restart.
 
 CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY)ENGINE=INNODB;

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

@@ -5,6 +5,10 @@
 --source include/have_innodb.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 let $have_deadlock=`select @@GLOBAL.innodb_deadlock_detect`;
 
 connection default;

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

@@ -1,6 +1,10 @@
 --source include/have_innodb.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t1 (
   pkey int NOT NULL PRIMARY KEY,
   c int

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

@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --connect(cancel_purge,localhost,root,,)
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point

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

@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point
 # lock_trx_handle_wait_enter, waiting for upd_cont signal, which must be

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

@@ -2,6 +2,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 # Purge can cause deadlock in the test, requesting page's RW_X_LATCH for trx
 # ids reseting, after trx 2 acqured RW_S_LATCH and suspended in debug sync point
 # lock_trx_handle_wait_enter, waiting for upd_cont signal, which must be

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

@@ -2,6 +2,10 @@
 --source include/count_sessions.inc
 --source include/default_charset.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 SET GLOBAL innodb_stats_persistent = 0;
 
 --echo #

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

@@ -1,6 +1,10 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # Check and select innodb lock type
 #

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

@@ -4,6 +4,10 @@
 # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections
 #
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --source include/not_embedded.inc
 
 let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);

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

@@ -1,5 +1,9 @@
 --source include/have_innodb.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # Bug #41453: Assertion `m_status == DA_ERROR' failed in
 # Diagnostics_area::sql_errno

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

@@ -6,6 +6,10 @@
 # be heavier than ones that had not.
 #
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 -- source include/have_innodb.inc
 
 SET default_storage_engine=InnoDB;

mysql-test/suite/innodb/t/insert-before-delete.test

@@ -3,6 +3,10 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --connect (pause_purge,localhost,root)
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
 

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

@@ -3,6 +3,10 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t VALUES (3);
 

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

@@ -1,5 +1,9 @@
 --source include/have_innodb.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --echo #
 --echo # MDEV-26642 Weird SELECT view when a record is
 --echo #            modified to the same value by two transactions

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

@@ -6,6 +6,9 @@
 --echo #
 
 call mtr.add_suppression("\\[Warning\\] InnoDB: Over 67 percent of the buffer pool");
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
 
 CREATE TABLE t1 (col1 INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2),(3),(4),(5);

mysql-test/suite/innodb/t/mdev-14846.test

@@ -4,6 +4,10 @@
 
 --source include/innodb_stable_estimates.inc
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 CREATE TABLE t1 (
  pk INT,
  f1 VARCHAR(10) NOT NULL,

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

@@ -4,6 +4,10 @@
 # concurrent CREATE OR REPLACE and transactional UPDATE
 #
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 --source include/have_innodb.inc
 
 CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB;

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

@@ -1,5 +1,9 @@
 source include/have_innodb.inc;
 
+--disable_query_log
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
+--enable_query_log
+
 #
 # MDEV-20354 All but last insert ignored in InnoDB tables when table locked
 #