Skip to content

Commit a34fd50

Browse files
author
Sergei Golubchik
committed
MDEV-7478 log-basename unpredictable behavior in standalone mode
* fix /etc/init.d/mysql to use log-basename for pid-filename * fix mysqld_safe not to force logging-to-file when log-basename is specified
1 parent f007f82 commit a34fd50

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

scripts/mysqld_safe.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ syslog_tag=
2828
user='@MYSQLD_USER@'
2929
pid_file=
3030
err_log=
31+
err_log_base=
3132

3233
syslog_tag_mysqld=mysqld
3334
syslog_tag_mysqld_safe=mysqld_safe
@@ -208,7 +209,7 @@ parse_arguments() {
208209
--user=*) user="$val"; SET_USER=1 ;;
209210
--log-basename=*|--hostname=*|--loose-log-basename=*)
210211
pid_file="$val.pid";
211-
err_log="$val.err";
212+
err_log_base="$val";
212213
;;
213214

214215
# these might have been set in a [mysqld_safe] section of my.cnf
@@ -577,7 +578,16 @@ then
577578
* ) err_log="$DATADIR/$err_log" ;;
578579
esac
579580
else
580-
err_log=$DATADIR/`@HOSTNAME@`.err
581+
if [ -n "$err_log_base" ]
582+
then
583+
err_log=$err_log_base.err
584+
case "$err_log" in
585+
/* ) ;;
586+
* ) err_log="$DATADIR/$err_log" ;;
587+
esac
588+
else
589+
err_log=$DATADIR/`@HOSTNAME@`.err
590+
fi
581591
fi
582592

583593
append_arg_to_args "--log-error=$err_log"

support-files/mysql.server.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ parse_server_arguments() {
146146
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
147147
datadir_set=1
148148
;;
149+
--log-basename=*|--hostname=*|--loose-log-basename=*)
150+
mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'`
151+
;;
149152
--pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
150153
--service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
151154
esac

0 commit comments

Comments
 (0)