Merge 10.2 into 10.3

32b34cb9 · Marko Mäkelä · d83a4432 · 2cd6afb0 · 32b34cb9
Commit 32b34cb9 authored Jun 14, 2020 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/suite/innodb/disabled.def mysql-test/suite/innodb/disabled.def +1 -0

No files found.
--- 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