20 files changed, 40 insertions, 2 deletions
diff --git a/mysql-test/t/bug39022.test b/mysql-test/t/bug39022.test
index 8d1deb163d7..d293788e58e 100644
--- a/mysql-test/t/bug39022.test
+++ b/mysql-test/t/bug39022.test
@@ -6,6 +6,8 @@
 --echo # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
 --echo #
 
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+
 CREATE TABLE t1(a TINYINT NOT NULL,b TINYINT,PRIMARY KEY(b)) ENGINE=innodb;
 CREATE TABLE t2(d TINYINT NOT NULL,UNIQUE KEY(d)) ENGINE=innodb;
 INSERT INTO t1 VALUES (13,0),(8,1),(9,2),(6,3),
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index 6a72ae9c38b..c82420640c2 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -2,6 +2,8 @@
 # Check for problems with delete
 #
 
+call mtr.add_suppression("Sort aborted.*");
+
 --disable_warnings
 drop table if exists t1,t2,t3,t11,t12;
 --enable_warnings
diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/t/filesort_debug.test
index 86795298f07..a8833617c09 100644
--- a/mysql-test/t/filesort_debug.test
+++ b/mysql-test/t/filesort_debug.test
@@ -2,6 +2,8 @@
 --source include/have_debug_sync.inc
 --source include/count_sessions.inc
 
+call mtr.add_suppression("Sort aborted.*");
+
 SET @old_debug= @@session.debug;
 
 --echo #
diff --git a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
index bdd295d0fa9..44b9ad53062 100644
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -861,7 +861,7 @@ CREATE TABLE t2 SELECT GROUP_CONCAT(UPPER(f1) ORDER BY f2) FROM t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t2;
 
-SET group_concat_max_len= DEFAULT;
+SET group_concat_max_len= 1024;
 SELECT LENGTH(GROUP_CONCAT(f1 ORDER BY f2)) FROM t1;
 
 SET group_concat_max_len= 499999;
diff --git a/mysql-test/t/innodb_mysql_lock.test b/mysql-test/t/innodb_mysql_lock.test
index 39ea7e5df88..24ace437c50 100644
--- a/mysql-test/t/innodb_mysql_lock.test
+++ b/mysql-test/t/innodb_mysql_lock.test
@@ -7,6 +7,8 @@ set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
 set global innodb_lock_wait_timeout=300;
 set session innodb_lock_wait_timeout=300;
 
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+
 --echo #
 --echo # Bug #22876 Four-way deadlock
 --echo #
diff --git a/mysql-test/t/limit_rows_examined.test b/mysql-test/t/limit_rows_examined.test
index 3f7424d5541..4997bacec57 100644
--- a/mysql-test/t/limit_rows_examined.test
+++ b/mysql-test/t/limit_rows_examined.test
@@ -2,6 +2,8 @@
 # Tests for LIMIT ROWS EXAMINED, MDEV-28
 #
 
+call mtr.add_suppression("Sort aborted.*");
+
 set @save_join_cache_level = @@join_cache_level;
 
 create table t1 (c1 char(2));
diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index 68e06dfa042..5a08b8015f0 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -4,6 +4,8 @@
 --source include/not_embedded.inc
 --source include/have_csv.inc
 
+call mtr.add_suppression("options .* --log_slow_queries is not set");
+
 # Several subtests modify global variables. Save the initial values only here,
 # but reset to the initial values per subtest.
 SET @old_general_log= @@global.general_log;
diff --git a/mysql-test/t/mix2_myisam.test b/mysql-test/t/mix2_myisam.test
index afb3caca0ea..97195130967 100644
--- a/mysql-test/t/mix2_myisam.test
+++ b/mysql-test/t/mix2_myisam.test
@@ -3,6 +3,9 @@
 # Last update: 2006-07-26 ML create this test as derivate from innodb.test
 #
 
+# Generated by an ALTER TABLE in include/mix2.inc
+call mtr.add_suppression("Can't find record in .*");
+
 let $engine_type= MyISAM;
 let $other_engine_type= MEMORY;
 # There are unfortunately only MyISAM and MEMORY all time available
diff --git a/mysql-test/t/mrr_icp_extra.test b/mysql-test/t/mrr_icp_extra.test
index f1b21154449..75ddc85b984 100644
--- a/mysql-test/t/mrr_icp_extra.test
+++ b/mysql-test/t/mrr_icp_extra.test
@@ -1,4 +1,7 @@
 
+# Generated by an ALTER TABLE in include/varchar.inc
+call mtr.add_suppression("Can't find record in .*");
+
 set @mrr_icp_extra_tmp=@@optimizer_switch;
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 SET NAMES latin1;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index a454fa25ac4..dac19c1d395 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -2,6 +2,9 @@
 # Test bugs in the MyISAM code
 #
 
+call mtr.add_suppression("Can't find record in '.*'");
+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
+
 # Initialise
 --disable_warnings
 drop table if exists t1,t2,t3;
diff --git a/mysql-test/t/myisam_enable_keys-10506.test b/mysql-test/t/myisam_enable_keys-10506.test
index 8e1c058c3f0..33eb973c402 100644
--- a/mysql-test/t/myisam_enable_keys-10506.test
+++ b/mysql-test/t/myisam_enable_keys-10506.test
@@ -1,6 +1,9 @@
 #
 # MDEV-10506 Protocol::end_statement(): Assertion `0' failed upon ALTER TABLE
 #
+
+call mtr.add_suppression("Can't find record in '.*'");
+
 CREATE TABLE t1 (
     pk INT AUTO_INCREMENT,
     i INT,
diff --git a/mysql-test/t/myisam_recover.test b/mysql-test/t/myisam_recover.test
index 0c686e59fb1..86a4d16d0f9 100644
--- a/mysql-test/t/myisam_recover.test
+++ b/mysql-test/t/myisam_recover.test
@@ -1,5 +1,7 @@
 --source include/count_sessions.inc
 
+call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
+
 --echo #
 --echo # Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted
 --echo # children..
diff --git a/mysql-test/t/order_by.test b/mysql-test/t/order_by.test
index 13c8db5a481..1e32f789806 100644
--- a/mysql-test/t/order_by.test
+++ b/mysql-test/t/order_by.test
@@ -2,6 +2,8 @@
 # Testing ORDER BY
 #
 
+call mtr.add_suppression("Sort aborted.*");
+
 --disable_warnings
 drop table if exists t1,t2,t3;
 --enable_warnings
diff --git a/mysql-test/t/partition_innodb.test b/mysql-test/t/partition_innodb.test
index 62a9173b526..a05e086d79b 100644
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@@ -6,6 +6,8 @@ if (`select plugin_auth_version < "5.6.25" from information_schema.plugins where
 --source include/have_partition.inc
 --source include/have_innodb.inc
 
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+
 set global default_storage_engine='innodb';
 set session default_storage_engine='innodb';
 
diff --git a/mysql-test/t/partition_innodb_plugin.test b/mysql-test/t/partition_innodb_plugin.test
index 18ed0a27f96..74e1747746b 100644
--- a/mysql-test/t/partition_innodb_plugin.test
+++ b/mysql-test/t/partition_innodb_plugin.test
@@ -4,6 +4,7 @@
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
 call mtr.add_suppression("InnoDB: Table .* does not exist in the InnoDB internal data dictionary .*");
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 
 --echo #
 --echo # Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,
diff --git a/mysql-test/t/row-checksum.test b/mysql-test/t/row-checksum.test
index 920a2384aa8..82efcf3ef93 100644
--- a/mysql-test/t/row-checksum.test
+++ b/mysql-test/t/row-checksum.test
@@ -54,7 +54,7 @@ checksum table t1 quick;
 checksum table t1 extended;
 drop table if exists t1;
 
-create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=fixed;
+create table t1 (a int null, v varchar(100)) engine=innodb checksum=0 row_format=compact;
 insert into t1 values(null, null), (1, "hello");
 checksum table t1;
 checksum table t1 quick;
diff --git a/mysql-test/t/set_statement_debug.test b/mysql-test/t/set_statement_debug.test
index a409370a61a..7089733ab4f 100644
--- a/mysql-test/t/set_statement_debug.test
+++ b/mysql-test/t/set_statement_debug.test
@@ -1,6 +1,8 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 
+call mtr.add_suppression("Sort aborted.*");
+
 set @save_debug_dbug= @@debug_dbug;
 
 # check that change debug_dbug visible in SELECT
diff --git a/mysql-test/t/set_statement_notembedded_binlog.test b/mysql-test/t/set_statement_notembedded_binlog.test
index 62c351ed6f7..b0c00008d4f 100644
--- a/mysql-test/t/set_statement_notembedded_binlog.test
+++ b/mysql-test/t/set_statement_notembedded_binlog.test
@@ -1,5 +1,6 @@
 --source include/have_log_bin.inc
 --source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 77b9c305ac8..88bba3b5ce6 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -12,6 +12,8 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t11,t12;
 drop view if exists v2;
 --enable_warnings
 
+call mtr.add_suppression("Sort aborted.*");
+
 set @subselect_tmp=@@optimizer_switch;
 set @@optimizer_switch=ifnull(@optimizer_switch_for_subselect_test,
                               "semijoin=on,firstmatch=on,loosescan=on,semijoin_with_cache=on,partial_match_rowid_merge=off,partial_match_table_scan=off");
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index f1576f021ec..c1f36129d75 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -8,6 +8,8 @@
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
 
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+
 --disable_warnings
 drop table if exists t1, t2;
 --enable_warnings