summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-04-01 18:26:19 +0200
committerSergei Golubchik <serg@mariadb.org>2015-04-09 18:42:43 +0200
commitc0878f64c5c39b9cc21f66a401040a708f4f0792 (patch)
treeed5a7be09890c9aed02bb797413ae41f44b5a60f /sql/sql_plugin.cc
parentbb1b61b312088ba9f5f2cb606594b6f33c284402 (diff)
downloadmariadb-git-c0878f64c5c39b9cc21f66a401040a708f4f0792.tar.gz
remove wrappers in encryption_keys.cc
invoke plugin methods directly
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 0c9ac6b6cb8..ee6650e14e2 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1562,6 +1562,9 @@ int plugin_init(int *argc, char **argv, int flags)
DBUG_ASSERT(strcmp(list_of_services[4].name, "debug_sync_service") == 0);
list_of_services[4].service= *(void**)&debug_sync_C_callback_ptr;
+ /* prepare encryption_keys service */
+ finalize_encryption_plugin(0);
+
mysql_mutex_lock(&LOCK_plugin);
initialized= 1;