database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-8374 - Debian: mysqld_safe Can't log to error log and syslog at the same time

Browse Source 
Let mysqld_safe_syslog.cnf force disable error log so that logging to syslog is
not affected by previous log_error setting.

Added handling of --skip-log-error to mysqld_safe.
This commit is contained in:
Sergey Vojtovich
2015-06-30 18:01:40 +04:00
parent 6efdc398ba
commit 94bc50650e
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/additions/mysqld_safe_syslog.cnf vendored
View File

@ -1,2 +1,3 @@
[mysqld_safe] [mysqld_safe]
skip_log_error
syslog syslog

15
scripts/mysqld_safe.sh
View File

@ -29,6 +29,7 @@ user='@MYSQLD_USER@'
pid_file= pid_file=
err_log= err_log=
err_log_base= err_log_base=
skip_err_log=0
syslog_tag_mysqld=mysqld syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe syslog_tag_mysqld_safe=mysqld_safe
@ -208,7 +209,14 @@ parse_arguments() {
# these might have been set in a [mysqld_safe] section of my.cnf # these might have been set in a [mysqld_safe] section of my.cnf
# they are added to mysqld command line to override settings from my.cnf # they are added to mysqld command line to override settings from my.cnf
--log[-_]error=*) err_log="$val" ;; --skip[-_]log[-_]error)
err_log=;
skip_err_log=1;
;;
--log[-_]error=*)
err_log="$val";
skip_err_log=0;
;;
--port=*) mysql_tcp_port="$val" ;; --port=*) mysql_tcp_port="$val" ;;
--socket=*) mysql_unix_port="$val" ;; --socket=*) mysql_unix_port="$val" ;;
@ -548,6 +556,11 @@ then
fi fi
fi fi
if [ $skip_err_log -eq 1 ]
then
append_arg_to_args "--skip-log-error"
fi
if [ -n "$err_log" -o $want_syslog -eq 0 ] if [ -n "$err_log" -o $want_syslog -eq 0 ]
then then
if [ -n "$err_log" ] if [ -n "$err_log" ]