mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 23:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix the encryption.filekeys_nofile test

Browse source 
and move the error reporting where it belongs
This commit is contained in:
Sergei Golubchik 2015-10-10 14:19:02 +02:00
commit c4e336e01e
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugin/file_key_management/file_key_management_plugin.cc
View file

@ -16,7 +16,6 @@
#include "parser.h"
#include <mysql/plugin_encryption.h>
#include <mysqld_error.h>
#include <string.h>
static char* filename;
@ -166,13 +165,6 @@ struct st_mariadb_encryption file_key_management_plugin= {
static int file_key_management_plugin_init(void *p)
{
if (!filename || !filename[0])
{
my_printf_error(ER_CANT_INITIALIZE_UDF,
"file_key_management-filename is not set", MYF(0));
return 1;
}
Parser parser(filename, filekey);
return parser.parse(&keys);
}

12
plugin/file_key_management/parser.cc
View file

@ -298,8 +298,16 @@ int Parser::parse_line(char **line_ptr, keyentry *key)
char* Parser::read_and_decrypt_file(const char *secret)
{
int f= my_open(filename, O_RDONLY, MYF(MY_WME));
if (f < 0)
if (!filename || !filename[0])
{
my_printf_error(EE_CANT_OPEN_STREAM,
"file-key-management-filename is not set",
MYF(ME_NOREFRESH));
goto err0;
}
int f;
if ((f= my_open(filename, O_RDONLY, MYF(MY_WME))) < 0)
goto err0;
my_off_t file_size;