diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-12 23:18:00 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-12 23:18:00 +0200 |
| commit | 86ec3c8f085c65b9ac2ef8776cad956465abddd7 (patch) | |
| tree | 924512c54bd3a6090a69986d62adfd8be7ce1fdd /scripts | |
| parent | 0a10f78f1245fef3b2a3f5ca9a413ab830ea088e (diff) | |
| parent | c5040dddee0e84076ec7860a9e8ce5df0ced581d (diff) | |
| download | mariadb-git-86ec3c8f085c65b9ac2ef8776cad956465abddd7.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
libmysql/libmysql.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 0e9f4de09fe..49c5b0f51b7 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -272,7 +272,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 @@ -311,7 +310,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 |