diff options
author | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 17:18:24 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 17:18:24 +0100 |
commit | 3212aaa995b9a20d4986f563bc7ebd34d5fc1477 (patch) | |
tree | dd9af865dea279e0ab843a8390a6dba03b822401 /scripts | |
parent | a18eb833cd1947737ef44a4151803d618b5dcd0b (diff) | |
download | mariadb-git-3212aaa995b9a20d4986f563bc7ebd34d5fc1477.tar.gz |
MDEV-6220 mysqldump will not backup database with --flush-logs parameter and log_error my.cnf parameter defined
some checks were "if [ -n "$err_log" ]", others were "if [ $want_syslog -eq 0 ]",
so when both are set, error log file was only partially initialized.
To avoid this ambiguity we reset want_syslog when error log file is used.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysqld_safe.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index e5e0b768440..3428fff6a59 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -586,6 +586,7 @@ then then # User explicitly asked for syslog, so warn that it isn't used log_error "Can't log to error log and syslog at the same time. Remove all --log-error configuration options for --syslog to take effect." + want_syslog=0 fi # Log to err_log file |