From 1831042279ca90f66ceac61db5cc4758cf353d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 30 Aug 2017 16:55:45 +0300 Subject: [PATCH] Temporarily disable encryption.innodb_encryption after the merge --- mysql-test/suite/encryption/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def index d92d3495cb8..49f7f94729d 100644 --- a/mysql-test/suite/encryption/disabled.def +++ b/mysql-test/suite/encryption/disabled.def @@ -12,3 +12,4 @@ innodb_scrub : MDEV-8139 scrubbing does not work reliably innodb_scrub_background : MDEV-8139 scrubbing does not work reliably +innodb_encryption : an adjustment for MDEV-13583 is needed