diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-25 13:26:57 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2015-02-26 10:17:23 +0200 |
| commit | 2eae6848d9758f7781ea86df2061b473542c33c6 (patch) | |
| tree | de30cd209d65c05aaaa2ec90e3ecf9e2bdd17626 /sql/encryption_keys.cc | |
| parent | 702aee649287a1b2c4834794732feaf13960fd58 (diff) | |
| download | mariadb-git-2eae6848d9758f7781ea86df2061b473542c33c6.tar.gz | |
MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key if
file_key_management_plugin is used
Fixed error handling and added disabling InnoDB redo log encryption
if encryption key management plugin is not there.
Diffstat (limited to 'sql/encryption_keys.cc')
| -rw-r--r-- | sql/encryption_keys.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/encryption_keys.cc b/sql/encryption_keys.cc index 835ecd470cf..07a5d346a05 100644 --- a/sql/encryption_keys.cc +++ b/sql/encryption_keys.cc @@ -13,7 +13,7 @@ uint opt_debug_encryption_key_version = 0; static plugin_ref encryption_key_manager= 0; static struct st_mariadb_encryption_key_management *handle; -uint get_latest_encryption_key_version() +unsigned int get_latest_encryption_key_version() { #ifndef DBUG_OFF if (debug_use_static_encryption_keys) @@ -31,7 +31,7 @@ uint get_latest_encryption_key_version() return BAD_ENCRYPTION_KEY_VERSION; } -uint has_encryption_key(uint version) +unsigned int has_encryption_key(uint version) { if (encryption_key_manager) return handle->has_key_version(version); @@ -39,7 +39,7 @@ uint has_encryption_key(uint version) return 0; } -uint get_encryption_key_size(uint version) +unsigned int get_encryption_key_size(uint version) { if (encryption_key_manager) return handle->get_key_size(version); |