1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7478 log-basename unpredictable behavior in standalone mode

Browse Source 
* 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
This commit is contained in:
Sergei Golubchik 2015-02-09 20:53:36 +01:00
parent f007f82881
commit a34fd50ce1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/mysqld_safe.sh
View File

@ -28,6 +28,7 @@ syslog_tag=
user='@MYSQLD_USER@' user='@MYSQLD_USER@'
pid_file= pid_file=
err_log= err_log=
err_log_base=
syslog_tag_mysqld=mysqld syslog_tag_mysqld=mysqld
syslog_tag_mysqld_safe=mysqld_safe syslog_tag_mysqld_safe=mysqld_safe
@ -208,7 +209,7 @@ parse_arguments() {
--user=*) user="$val"; SET_USER=1 ;; --user=*) user="$val"; SET_USER=1 ;;
--log-basename=*|--hostname=*|--loose-log-basename=*) --log-basename=*|--hostname=*|--loose-log-basename=*)
pid_file="$val.pid"; 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 # these might have been set in a [mysqld_safe] section of my.cnf
@ -572,6 +573,14 @@ then
err_log="$err_log".err err_log="$err_log".err
fi fi
case "$err_log" in
/* ) ;;
* ) err_log="$DATADIR/$err_log" ;;
esac
else
if [ -n "$err_log_base" ]
then
err_log=$err_log_base.err
case "$err_log" in case "$err_log" in
/* ) ;; /* ) ;;
* ) err_log="$DATADIR/$err_log" ;; * ) err_log="$DATADIR/$err_log" ;;
@ -579,6 +588,7 @@ then
else else
err_log=$DATADIR/`@HOSTNAME@`.err err_log=$DATADIR/`@HOSTNAME@`.err
fi fi
fi
append_arg_to_args "--log-error=$err_log" append_arg_to_args "--log-error=$err_log"

3
support-files/mysql.server.sh
View File

@ -146,6 +146,9 @@ parse_server_arguments() {
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
datadir_set=1 datadir_set=1
;; ;;
--log-basename=*|--hostname=*|--loose-log-basename=*)
mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'`
;;
--pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
esac esac