summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-02-16 22:50:00 +0200
committerunknown <monty@mashka.mysql.fi>2003-02-16 22:50:00 +0200
commit73cc50e45d5ad498514ce6dd103f0a0e82162a5b (patch)
tree10aed87e653c90aca05d9b435b57af56f6e7398e /scripts
parentfb2c8c7cb879f7f46fda0398e4aa3051d9017997 (diff)
downloadmariadb-git-73cc50e45d5ad498514ce6dd103f0a0e82162a5b.tar.gz
Patch for novell
Reverted wrong patch for mysqld_safe.sh client/mysqldump.c: Patch for novell. scripts/mysqld_safe.sh: Reverted wrong patch. (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 49c5b0f51b7..3ccf5301503 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -272,6 +272,7 @@ 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
@@ -310,7 +311,6 @@ 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