summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-30 16:55:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-30 16:55:45 +0300
commit1831042279ca90f66ceac61db5cc4758cf353d7c (patch)
treedebd5e341f18c0721c0c44cbbe33885a6a47bfb9
parent829752973bd67bc4aaa9acf27dbc4715b62ade23 (diff)
downloadmariadb-git-1831042279ca90f66ceac61db5cc4758cf353d7c.tar.gz
Temporarily disable encryption.innodb_encryption after the merge
-rw-r--r--mysql-test/suite/encryption/disabled.def1
1 files changed, 1 insertions, 0 deletions
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