1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't enable file_key_management_plugin by default (as this gives warnings in the log)

Browse Source 
Better warning from file_key_management plugin if filename is not given
This commit is contained in:
Monty 2015-10-09 13:02:55 +03:00
parent c696fc74cf
commit 602c803bd9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/SETUP.sh
View File

@ -205,7 +205,7 @@ fi
max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"
max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache"
max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent"
max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent --without-plugin=plugin_file_key_management"
all_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-innodb_plugin --with-libevent"
#

2
cmake/configure.pl
View File

@ -135,7 +135,7 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DWITH_EXTRA_CHARSETS=".$charsets;
next;
}
if($option =~ /without-plugin=/)
if($option =~ /without-plugin=/ || $option =~ /without-plugin-/)
{
$cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1";
next;

8
plugin/file_key_management/file_key_management_plugin.cc
View File

@ -16,6 +16,7 @@
#include "parser.h"
#include <mysql/plugin_encryption.h>
#include <mysqld_error.h>
#include <string.h>
static char* filename;
@ -165,6 +166,13 @@ 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);
}