diff options
author | Elena Stepanova <elenst@mariadb.com> | 2020-08-03 02:57:50 +0300 |
---|---|---|
committer | Elena Stepanova <elenst@mariadb.com> | 2020-08-03 02:57:50 +0300 |
commit | 9c84b80f8403f7cdbe41170850bc94b60239e2f6 (patch) | |
tree | eb36f60c8ff1c7ca1892c1a3cf5a909da2288706 | |
parent | db2a21733406fdd3314256216d0ce050d5399d94 (diff) | |
parent | dbb4572fe95bbf7f32949d6ab9228f4891e2f147 (diff) | |
download | mariadb-git-9c84b80f8403f7cdbe41170850bc94b60239e2f6.tar.gz |
Merge branch '10.1' into 10.2
-rw-r--r-- | mysql-test/suite/parts/r/partition_debug.result | 1 | ||||
-rw-r--r-- | mysql-test/suite/parts/t/partition_debug.test | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result index e438cae7a14..96ed9b010b7 100644 --- 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 index 864452f8d8b..6d7cf3ae8b3 100644 --- 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 # |