summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-03-27 09:45:22 +0100
committerSergei Golubchik <serg@mariadb.org>2015-04-09 18:42:43 +0200
commit9ccafffc29526ea30151eb3e62901bfdb77aaf84 (patch)
treeeaece68c95f89b79898c903340948b968c479035 /storage
parent6d3dace7d95bfa9627e524787d076124afc7e773 (diff)
downloadmariadb-git-9ccafffc29526ea30151eb3e62901bfdb77aaf84.tar.gz
rename "encryption key management plugin" to "encryption plugin"
because it's going to do more than just key management
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/log/log0crypt.cc2
-rw-r--r--storage/xtradb/log/log0crypt.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/log/log0crypt.cc b/storage/innobase/log/log0crypt.cc
index 2aaa0aa4550..4a7474761a3 100644
--- a/storage/innobase/log/log0crypt.cc
+++ b/storage/innobase/log/log0crypt.cc
@@ -32,7 +32,7 @@ Modified Jan Lindström jan.lindstrom@mariadb.com
#include "srv0start.h" // for srv_start_lsn
#include "log0recv.h" // for recv_sys
-#include "mysql/plugin_encryption_key_management.h" // for BAD_ENCRYPTION_KEY_VERSION
+#include "mysql/plugin_encryption.h" // for BAD_ENCRYPTION_KEY_VERSION
#include "ha_prototypes.h" // IB_LOG_
/* If true, enable redo log encryption. */
diff --git a/storage/xtradb/log/log0crypt.cc b/storage/xtradb/log/log0crypt.cc
index 2aaa0aa4550..4a7474761a3 100644
--- a/storage/xtradb/log/log0crypt.cc
+++ b/storage/xtradb/log/log0crypt.cc
@@ -32,7 +32,7 @@ Modified Jan Lindström jan.lindstrom@mariadb.com
#include "srv0start.h" // for srv_start_lsn
#include "log0recv.h" // for recv_sys
-#include "mysql/plugin_encryption_key_management.h" // for BAD_ENCRYPTION_KEY_VERSION
+#include "mysql/plugin_encryption.h" // for BAD_ENCRYPTION_KEY_VERSION
#include "ha_prototypes.h" // IB_LOG_
/* If true, enable redo log encryption. */