summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <jani@rhols221.adsl.netsonic.fi>2003-02-12 19:53:30 +0200
committerunknown <jani@rhols221.adsl.netsonic.fi>2003-02-12 19:53:30 +0200
commitc5040dddee0e84076ec7860a9e8ce5df0ced581d (patch)
tree84ff430558e9ae4745cf761d8bdd6b7e25f9224f /scripts
parentf3282731343b6cc6cb4679ac15b40e205b710256 (diff)
downloadmariadb-git-c5040dddee0e84076ec7860a9e8ce5df0ced581d.tar.gz
Fixed a bug in mysqld_safe, when it earlier could have removed
a socket from another, still living MySQL server.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index febc7b8e595..e937789e6ef 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -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