Merge branch '10.1' into 10.2

MariaDB · Aug 2, 2020 · 9c84b80 · 9c84b80
2 parents db2a217 + dbb4572
commit 9c84b80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result
@@ -1,3 +1,4 @@
+FLUSH TABLES;
 #
 # Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
 # Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE

diff --git a/mysql-test/suite/parts/t/partition_debug.test b/mysql-test/suite/parts/t/partition_debug.test
@@ -8,6 +8,10 @@
 # Crash tests don't work with embedded
 --source include/not_embedded.inc
 
+# Make sure system tables are not open, as the test will kill the server
+# and it will cause corruption errors in the log
+FLUSH TABLES;
+
 # Partitioning test that require debug features
 
 --echo #