mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Fixed a bug in mysqld_safe, when it earlier could have removed
a socket from another, still living MySQL server.
This commit is contained in:
parent
f328273134
commit
c5040dddee
1 changed files with 1 additions and 2 deletions
|
@ -270,7 +270,6 @@ echo "Starting $MYSQLD daemon with databases from $DATADIR"
|
|||
echo "`date +'%y%m%d %H:%M:%S mysqld started'`" >> $err_log
|
||||
while true
|
||||
do
|
||||
rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety
|
||||
if test -z "$args"
|
||||
then
|
||||
$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
|
||||
|
@ -309,7 +308,7 @@ do
|
|||
I=`expr $I + 1`
|
||||
done
|
||||
fi
|
||||
|
||||
rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety
|
||||
echo "`date +'%y%m%d %H:%M:%S'` mysqld restarted" | tee -a $err_log
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in a new issue