From 94bc50650eb490e8d844acfc700f75992857509a Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Tue, 30 Jun 2015 18:01:40 +0400
Subject: [PATCH] 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.
---
 debian/additions/mysqld_safe_syslog.cnf |  1 +
 scripts/mysqld_safe.sh                  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/additions/mysqld_safe_syslog.cnf b/debian/additions/mysqld_safe_syslog.cnf
index 3b0445d6bd8..08984c1716b 100644
--- a/debian/additions/mysqld_safe_syslog.cnf
+++ b/debian/additions/mysqld_safe_syslog.cnf
@@ -1,2 +1,3 @@
 [mysqld_safe]
+skip_log_error
 syslog
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index fdb4464a98f..49a2b0ed8ed 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -29,6 +29,7 @@ user='@MYSQLD_USER@'
 pid_file=
 err_log=
 err_log_base=
+skip_err_log=0
 
 syslog_tag_mysqld=mysqld
 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
       # 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" ;;
       --socket=*) mysql_unix_port="$val" ;;
 
@@ -548,6 +556,11 @@ then
   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 ]
 then
   if [ -n "$err_log" ]