File tree Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ syslog_tag=
28
28
user=' @MYSQLD_USER@'
29
29
pid_file=
30
30
err_log=
31
+ err_log_base=
31
32
32
33
syslog_tag_mysqld=mysqld
33
34
syslog_tag_mysqld_safe=mysqld_safe
@@ -208,7 +209,7 @@ parse_arguments() {
208
209
--user=* ) user=" $val " ; SET_USER=1 ;;
209
210
--log-basename=* |--hostname=* |--loose-log-basename=* )
210
211
pid_file=" $val .pid" ;
211
- err_log =" $val .err " ;
212
+ err_log_base =" $val " ;
212
213
;;
213
214
214
215
# these might have been set in a [mysqld_safe] section of my.cnf
@@ -577,7 +578,16 @@ then
577
578
* ) err_log=" $DATADIR /$err_log " ;;
578
579
esac
579
580
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
581
591
fi
582
592
583
593
append_arg_to_args " --log-error=$err_log "
Original file line number Diff line number Diff line change @@ -146,6 +146,9 @@ parse_server_arguments() {
146
146
--datadir=* ) datadir=` echo " $arg " | sed -e ' s/^[^=]*=//' `
147
147
datadir_set=1
148
148
;;
149
+ --log-basename=* |--hostname=* |--loose-log-basename=* )
150
+ mysqld_pid_file_path=` echo " $arg .pid" | sed -e ' s/^[^=]*=//' `
151
+ ;;
149
152
--pid-file=* ) mysqld_pid_file_path=` echo " $arg " | sed -e ' s/^[^=]*=//' ` ;;
150
153
--service-startup-timeout=* ) service_startup_timeout=` echo " $arg " | sed -e ' s/^[^=]*=//' ` ;;
151
154
esac
You can’t perform that action at this time.
0 commit comments