diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-08 17:07:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-09 14:22:22 +0200 |
| commit | 7bd2f20e880a5871635260c0a96448631c28b2c5 (patch) | |
| tree | 08624574102ced268f0a0ecab693727c8c74d14a /sql/encryption.cc | |
| parent | 39b46ae934bfa886314f918068d1e195970fe65e (diff) | |
| download | mariadb-git-7bd2f20e880a5871635260c0a96448631c28b2c5.tar.gz | |
make encrypt-binlog and encrypt-tmp-files to fail if no encryption
--encrypt-binlog and --encrypt-tmp-files used to mean
"encrypt XXX if encryption is available, otherwise don't encrypt",
now they mean "encrypt or fail with an error".
Diffstat (limited to 'sql/encryption.cc')
| -rw-r--r-- | sql/encryption.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/encryption.cc b/sql/encryption.cc index 9fa000abf34..209b092b0a4 100644 --- a/sql/encryption.cc +++ b/sql/encryption.cc @@ -19,8 +19,6 @@ #include "sql_plugin.h" #include <my_crypt.h> -void init_io_cache_encryption(); - /* there can be only one encryption plugin enabled */ static plugin_ref encryption_manager= 0; struct encryption_service_st encryption_handler; @@ -81,8 +79,6 @@ int initialize_encryption_plugin(st_plugin_int *plugin) encryption_handler.encryption_key_get_latest_version_func= handle->get_latest_key_version; // must be the last - init_io_cache_encryption(); - return 0; } @@ -100,7 +96,6 @@ int finalize_encryption_plugin(st_plugin_int *plugin) if (encryption_manager) plugin_unlock(NULL, encryption_manager); encryption_manager= 0; - init_io_cache_encryption(); return 0; } |