summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_zip
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-08 16:04:01 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-08 16:04:01 +0200
commit93b4f84ab25bd2f79e024f339cf06fe2bd99d586 (patch)
tree06fa007c99f039067fab2d2f00607b8f416181cf /mysql-test/suite/innodb_zip
parent1e8189fceed795a16d31f484f844b7a4a048b920 (diff)
parent2ef2e2322a03b6decf4ad00721a27e6dc308847f (diff)
downloadmariadb-git-93b4f84ab25bd2f79e024f339cf06fe2bd99d586.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/innodb_zip')
-rw-r--r--mysql-test/suite/innodb_zip/disabled.def2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_zip/disabled.def b/mysql-test/suite/innodb_zip/disabled.def
index 8b137891791..fcf7333f843 100644
--- a/mysql-test/suite/innodb_zip/disabled.def
+++ b/mysql-test/suite/innodb_zip/disabled.def
@@ -1 +1 @@
-
+recover : MDEV-22512 recovery runs out of memory before 10.5