Commit 602c803b authored by Monty's avatar Monty

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

Better warning from file_key_management plugin if filename is not given
parent c696fc74
...@@ -205,7 +205,7 @@ fi ...@@ -205,7 +205,7 @@ fi
max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"
max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache" 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" all_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-innodb_plugin --with-libevent"
# #
......
...@@ -135,7 +135,7 @@ foreach my $option (@ARGV) ...@@ -135,7 +135,7 @@ foreach my $option (@ARGV)
$cmakeargs = $cmakeargs." -DWITH_EXTRA_CHARSETS=".$charsets; $cmakeargs = $cmakeargs." -DWITH_EXTRA_CHARSETS=".$charsets;
next; next;
} }
if($option =~ /without-plugin=/) if($option =~ /without-plugin=/ || $option =~ /without-plugin-/)
{ {
$cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1"; $cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1";
next; next;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "parser.h" #include "parser.h"
#include <mysql/plugin_encryption.h> #include <mysql/plugin_encryption.h>
#include <mysqld_error.h>
#include <string.h> #include <string.h>
static char* filename; static char* filename;
...@@ -165,6 +166,13 @@ struct st_mariadb_encryption file_key_management_plugin= { ...@@ -165,6 +166,13 @@ struct st_mariadb_encryption file_key_management_plugin= {
static int file_key_management_plugin_init(void *p) 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); Parser parser(filename, filekey);
return parser.parse(&keys); return parser.parse(&keys);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment