Skip to content

Commit 94bc506

Browse files
committed
MDEV-8374 - Debian: mysqld_safe Can't log to error log and syslog at the same time
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.
1 parent 6efdc39 commit 94bc506

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[mysqld_safe]
2+
skip_log_error
23
syslog

scripts/mysqld_safe.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ user='@MYSQLD_USER@'
2929
pid_file=
3030
err_log=
3131
err_log_base=
32+
skip_err_log=0
3233

3334
syslog_tag_mysqld=mysqld
3435
syslog_tag_mysqld_safe=mysqld_safe
@@ -208,7 +209,14 @@ parse_arguments() {
208209

209210
# these might have been set in a [mysqld_safe] section of my.cnf
210211
# they are added to mysqld command line to override settings from my.cnf
211-
--log[-_]error=*) err_log="$val" ;;
212+
--skip[-_]log[-_]error)
213+
err_log=;
214+
skip_err_log=1;
215+
;;
216+
--log[-_]error=*)
217+
err_log="$val";
218+
skip_err_log=0;
219+
;;
212220
--port=*) mysql_tcp_port="$val" ;;
213221
--socket=*) mysql_unix_port="$val" ;;
214222

@@ -548,6 +556,11 @@ then
548556
fi
549557
fi
550558

559+
if [ $skip_err_log -eq 1 ]
560+
then
561+
append_arg_to_args "--skip-log-error"
562+
fi
563+
551564
if [ -n "$err_log" -o $want_syslog -eq 0 ]
552565
then
553566
if [ -n "$err_log" ]

0 commit comments

Comments
 (0)