summaryrefslogtreecommitdiff
path: root/mysql-test/t/xa.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-12-19 17:32:45 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-02-10 06:30:42 -0500
commit3435e8a51552c3c73feab4b1c731dd8da225618c (patch)
tree9bdd89d7134a6618d1b6438c9af1713732846c1d /mysql-test/t/xa.test
parent185d140f191f550d030550f6718103a89eb64212 (diff)
downloadmariadb-git-3435e8a51552c3c73feab4b1c731dd8da225618c.tar.gz
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
Diffstat (limited to 'mysql-test/t/xa.test')
-rw-r--r--mysql-test/t/xa.test2
1 files changed, 2 insertions, 0 deletions
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