mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

make encrypt-binlog and encrypt-tmp-files to fail if no encryption

Browse source 
--encrypt-binlog and --encrypt-tmp-files used to mean
"encrypt XXX if encryption is available, otherwise don't encrypt",
now they mean "encrypt or fail with an error".
This commit is contained in:
Sergei Golubchik 2015-09-08 17:07:34 +02:00
commit 7bd2f20e88
5 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sql/mysqld.cc
View file

@ -278,6 +278,8 @@ extern "C" sig_handler handle_fatal_signal(int sig);
#define ENABLE_TEMP_POOL 0
#endif
int init_io_cache_encryption();
/* Constants */
#include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
@ -5231,6 +5233,9 @@ static int init_server_components()
}
}
if (init_io_cache_encryption())
unireg_abort(1);
if (opt_abort)
unireg_abort(0);
@ -5329,10 +5334,11 @@ static int init_server_components()
* but to be able to have mysql_mutex_assert_owner() in code,
* we do it anyway */
mysql_mutex_lock(mysql_bin_log.get_log_lock());
if (mysql_bin_log.open(opt_bin_logname, LOG_BIN, 0, 0,
WRITE_CACHE, max_binlog_size, 0, TRUE))
unireg_abort(1);
int r= mysql_bin_log.open(opt_bin_logname, LOG_BIN, 0, 0,
WRITE_CACHE, max_binlog_size, 0, TRUE);
mysql_mutex_unlock(mysql_bin_log.get_log_lock());
if (r)
unireg_abort(1);
}
#ifdef HAVE_REPLICATION