diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 16:37:00 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 16:37:00 +0000 |
| commit | 13752faa4db431d53ea80c2d986f1b378574f452 (patch) | |
| tree | 27e610460b2deaa74306a8ddc791d1f75d28e791 /plugin/aws_key_management | |
| parent | bc6426e44d4a1f043ac31687aec4b3e121020eaa (diff) | |
| download | mariadb-git-13752faa4db431d53ea80c2d986f1b378574f452.tar.gz | |
Fix compilation of aws_key_management plugin
Diffstat (limited to 'plugin/aws_key_management')
| -rw-r--r-- | plugin/aws_key_management/aws_key_management_plugin.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugin/aws_key_management/aws_key_management_plugin.cc b/plugin/aws_key_management/aws_key_management_plugin.cc index dd0c7021fca..582bbb6cdd2 100644 --- a/plugin/aws_key_management/aws_key_management_plugin.cc +++ b/plugin/aws_key_management/aws_key_management_plugin.cc @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> #include <mysqld_error.h> +#include <my_sys.h> #include <map> #include <algorithm> #include <string> @@ -194,7 +195,7 @@ static int plugin_init(void *p) client = new KMSClient(clientConfiguration); if (!client) { - my_printf_error(ER_UNKNOWN_ERROR, "Can not initialize KMS client", ME_ERROR_LOG,); + my_printf_error(ER_UNKNOWN_ERROR, "Can not initialize KMS client", ME_ERROR_LOG | ME_WARNING); return -1; } @@ -259,12 +260,12 @@ static int load_key(KEY_INFO *info) if (!ret) { - my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: loaded key %u, version %u, key length %u bit", ME_ERROR_LOG | ER_NOTE, + my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: loaded key %u, version %u, key length %u bit", ME_ERROR_LOG | ME_NOTE, info->key_id, info->key_version,(uint)info->length*8); } else { - my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: key %u, version %u could not be decrypted", ME_ERROR_LOG | ER_WARNING, + my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: key %u, version %u could not be decrypted", ME_ERROR_LOG | ME_WARNING, info->key_id, info->key_version); } return ret; @@ -421,7 +422,7 @@ static int aws_generate_datakey(uint keyid, uint version) return(-1); } close(fd); - my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: generated encrypted datakey for key id=%u, version=%u", ME_ERROR_LOG | ER_NOTE, + my_printf_error(ER_UNKNOWN_ERROR, "AWS KMS plugin: generated encrypted datakey for key id=%u, version=%u", ME_ERROR_LOG | ME_NOTE, keyid, version); return(0); } |