diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
| commit | 91acc8b16fdd8409765f32b5453851366552a709 (patch) | |
| tree | 18c04064e9fc127c5e477ec08613aae7baaab2ae /scripts/mysqld_safe.sh | |
| parent | 4c69dc8116950d6bf0b09bfbc31a86d89831a364 (diff) | |
| parent | 0403790722e3941779ccea26e85fcd818e2320b5 (diff) | |
| download | mariadb-git-91acc8b16fdd8409765f32b5453851366552a709.tar.gz | |
Merge tag 'mariadb-10.0.21' into 10.0-galera
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 833920f060b..b8df320bf93 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 @@ -291,7 +292,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" ;; @@ -639,6 +647,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" ] |