diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-12 13:14:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-12 13:14:55 +0100 |
| commit | 5dce6aa1fe36d315f17eb9f4a0f5be808805e94c (patch) | |
| tree | 009d91ac356abbed8e8d68d4109823fa7c3f67c9 /scripts | |
| parent | ed839052d74847c39484eff18652e5c6ba270266 (diff) | |
| parent | 2a1be9cdf81ca77253faaf0e2dfc1dca7f7702f5 (diff) | |
| download | mariadb-git-5dce6aa1fe36d315f17eb9f4a0f5be808805e94c.tar.gz | |
Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 3428fff6a59..303e7a29a6d 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -28,6 +28,7 @@ syslog_tag= user='@MYSQLD_USER@' pid_file= err_log= +err_log_base= syslog_tag_mysqld=mysqld syslog_tag_mysqld_safe=mysqld_safe @@ -208,7 +209,7 @@ parse_arguments() { --user=*) user="$val"; SET_USER=1 ;; --log-basename=*|--hostname=*|--loose-log-basename=*) pid_file="$val.pid"; - err_log="$val.err"; + err_log_base="$val"; ;; # these might have been set in a [mysqld_safe] section of my.cnf @@ -577,7 +578,16 @@ then * ) err_log="$DATADIR/$err_log" ;; esac else - err_log=$DATADIR/`@HOSTNAME@`.err + if [ -n "$err_log_base" ] + then + err_log=$err_log_base.err + case "$err_log" in + /* ) ;; + * ) err_log="$DATADIR/$err_log" ;; + esac + else + err_log=$DATADIR/`@HOSTNAME@`.err + fi fi append_arg_to_args "--log-error=$err_log" |