diff options
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index a98abe6629b..c96fc4567f0 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -30,6 +30,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 @@ -292,7 +293,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" ;; @@ -649,6 +657,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" ] |