Merge branch '10.1' into 10.2

9c84b80f · Elena Stepanova · db2a2173 · dbb4572f · 9c84b80f · 9c84b80f
Commit 9c84b80f authored Aug 03, 2020 by Elena Stepanova
Showing with 5 additions and 0 deletions

mysql-test/suite/parts/r/partition_debug.result mysql-test/suite/parts/r/partition_debug.result +1 -0

mysql-test/suite/parts/t/partition_debug.test mysql-test/suite/parts/t/partition_debug.test +4 -0

No files found.
--- a/mysql-test/suite/parts/r/partition_debug.result
+++ b/mysql-test/suite/parts/r/partition_debug.result
+FLUSH TABLES;
 #
 # Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
 # Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE

--- 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 #