Merge commit 10.3 into 10.4

MariaDB · Jun 14, 2020 · ceaa8b6 · ceaa8b6
2 parents b58586a + 32b34cb
commit ceaa8b6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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