From 3435e8a51552c3c73feab4b1c731dd8da225618c Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 19 Dec 2016 17:32:45 -0500 Subject: MDEV-7635: Part 1 innodb_autoinc_lock_mode = 2 innodb_buffer_pool_dump_at_shutdown = ON innodb_buffer_pool_dump_pct = 25 innodb_buffer_pool_load_at_startup = ON innodb_checksum_algorithm = CRC32 innodb_file_format = Barracuda innodb_large_prefix = ON innodb_log_compressed_pages = ON innodb_purge_threads = 4 innodb_strict_mode = ON binlog_annotate_row_events = ON binlog_format = MIXED binlog-row-event-max-size = 8192 group_concat_max_len = 1M lock_wait_timeout = 86400 log_slow_admin_statements = ON log_slow_slave_statements = ON log_warnings = 2 max_allowed_packet = 16M replicate_annotate_row_events = ON slave_net_timeout = 60 sync_binlog = 1 aria_recover = BACKUP,QUICK myisam_recover_options = BACKUP,QUICK --- mysql-test/t/innodb_mysql_lock.test | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mysql-test/t/innodb_mysql_lock.test') 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 # -- cgit v1.2.1