database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt


VC++Files/sql/mysqld.dsp:
  Auto merged
This commit is contained in:
unknown
2006-07-14 14:45:23 -07:00
parent 912e54d7b8 728fbb3ab5
commit 233ff83c67
211 changed files with 5807 additions and 7398 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