diff options
| author | unknown <igor@rurik.mysql.com> | 2006-07-14 14:45:23 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-07-14 14:45:23 -0700 |
| commit | 233ff83c67cf89656b380e9e213ffb9a9d639d82 (patch) | |
| tree | a475d8d28c7331408aa0ed735d377f2be7051407 /scripts | |
| parent | 912e54d7b8452d74a459907a5023f2b7c6ab025c (diff) | |
| parent | 728fbb3ab564e850dd9214799d70663d3439aa6e (diff) | |
| download | mariadb-git-233ff83c67cf89656b380e9e213ffb9a9d639d82.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
VC++Files/sql/mysqld.dsp:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe-watch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe-watch.sh b/scripts/mysqld_safe-watch.sh index c59b3b2614d..c837ba9a118 100644 --- a/scripts/mysqld_safe-watch.sh +++ b/scripts/mysqld_safe-watch.sh @@ -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 |