diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/partition_innodb.test | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/partition_innodb.test')
| -rw-r--r-- | mysql-test/main/partition_innodb.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/main/partition_innodb.test b/mysql-test/main/partition_innodb.test index f1a25b91c5b..629bc29e758 100644 --- a/mysql-test/main/partition_innodb.test +++ b/mysql-test/main/partition_innodb.test @@ -1,6 +1,7 @@ --source include/not_embedded.inc --source include/have_partition.inc --source include/have_innodb.inc +--source include/default_optimizer_switch.inc call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction"); |