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 /unittest/sql | |
| 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 'unittest/sql')
| -rw-r--r-- | unittest/sql/mf_iocache-t.cc | 8 |
1 files changed, 6 insertions, 2 deletions
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, ...) { } |