From 7bd2f20e880a5871635260c0a96448631c28b2c5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 8 Sep 2015 17:07:34 +0200 Subject: 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". --- unittest/sql/mf_iocache-t.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'unittest') diff --git a/unittest/sql/mf_iocache-t.cc b/unittest/sql/mf_iocache-t.cc index c89f8a9f038..590684ea3cc 100644 --- a/unittest/sql/mf_iocache-t.cc +++ b/unittest/sql/mf_iocache-t.cc @@ -21,7 +21,7 @@ #define KEY_SIZE (128/8) my_bool encrypt_tmp_files; -void init_io_cache_encryption(); +int init_io_cache_encryption(); uint encryption_key_get_latest_version_func(uint) { @@ -79,7 +79,11 @@ struct encryption_service_st encryption_handler= encryption_encrypted_length_func }; -void sql_print_information(const char *format, ...) +void sql_print_information(const char *format, ...) +{ +} + +void sql_print_error(const char *format, ...) { } -- cgit v1.2.1