diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-14 10:30:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-14 10:30:20 +0300 |
commit | 32b34cb95edc1032381225b58780fc92cb449200 (patch) | |
tree | 8deb37fa8e9d7daecfbaa00ea60b585684620f0f | |
parent | d83a4432503d199f6aed8e378563b08471d090dc (diff) | |
parent | 2cd6afb08372dac6220f69fbb6b44d2d2e964cfc (diff) | |
download | mariadb-git-32b34cb95edc1032381225b58780fc92cb449200.tar.gz |
Merge 10.2 into 10.3
-rw-r--r-- | mysql-test/suite/innodb/disabled.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def index 35c941f8af7..4484417afce 100644 --- a/mysql-test/suite/innodb/disabled.def +++ b/mysql-test/suite/innodb/disabled.def @@ -11,3 +11,4 @@ ############################################################################## create-index-debug : MDEV-13680 InnoDB may crash when btr_page_alloc() fails +innodb_force_recovery_rollback : MDEV-22889 InnoDB occasionally breaks ACID |