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 /include/my_aes.h | |
| 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 'include/my_aes.h')
| -rw-r--r-- | include/my_aes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_aes.h b/include/my_aes.h index db50d35efd5..057fa1e9860 100644 --- a/include/my_aes.h +++ b/include/my_aes.h @@ -33,8 +33,8 @@ typedef int Crypt_result; #define AES_KEY_CREATION_FAILED -10 #define CRYPT_KEY_OK 0 -#define CRYPT_BUFFER_TO_SMALL -11; -#define CRYPT_KEY_UNKNOWN -48; +#define CRYPT_BUFFER_TO_SMALL -11 +#define CRYPT_KEY_UNKNOWN -48 /* The max block sizes of all supported algorithms */ #define MY_AES_BLOCK_SIZE 16 |