diff options
Diffstat (limited to 'sql/encryption.cc')
| -rw-r--r-- | sql/encryption.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/encryption.cc b/sql/encryption.cc index 13239b91910..3c7ba2e997b 100644 --- a/sql/encryption.cc +++ b/sql/encryption.cc @@ -109,6 +109,7 @@ int initialize_encryption_plugin(st_plugin_int *plugin) int finalize_encryption_plugin(st_plugin_int *plugin) { + int deinit_status= 0; bool used= plugin_ref_to_int(encryption_manager) == plugin; if (used) @@ -118,18 +119,15 @@ int finalize_encryption_plugin(st_plugin_int *plugin) encryption_handler.encryption_ctx_size_func= zero_size; } - if (plugin && plugin->plugin->deinit && plugin->plugin->deinit(NULL)) - { - DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.", - plugin->name.str)); - } + if (plugin && plugin->plugin->deinit) + deinit_status= plugin->plugin->deinit(NULL); if (used) { plugin_unlock(NULL, encryption_manager); encryption_manager= 0; } - return 0; + return deinit_status; } /****************************************************************** |