database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1

Browse Source 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0


configure.in:
  Auto merged
This commit is contained in:
unknown
2006-06-30 00:14:25 -04:00
parent a14c9ddf2b 2a100c1c5c
commit 29423c2d27
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mysqld_safe-watch.sh
View File

@ -93,10 +93,10 @@ do
if test "$#" -eq 0
then
nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
--skip-locking >> $err 2>&1 &
--skip-external-locking >> $err 2>&1 &
else
nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
--skip-locking "$@" >> $err 2>&1 &
--skip-external-locking "$@" >> $err 2>&1 &
fi
pid=$!
rm -f $lockfile