summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-14 10:32:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-14 10:32:09 +0300
commitceaa8b647a1b4464980e66cc3ea766e5b19666ee (patch)
tree56d4a06bc442c531103fe9391b467736d6b549ca
parentb58586aae938e6aa7714c9bb3813da908e49010a (diff)
parent32b34cb95edc1032381225b58780fc92cb449200 (diff)
downloadmariadb-git-ceaa8b647a1b4464980e66cc3ea766e5b19666ee.tar.gz
Merge commit 10.3 into 10.4
-rw-r--r--mysql-test/suite/innodb/disabled.def1
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