diff options
| author | unknown <evgen@sunlight.local> | 2006-06-30 03:34:54 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-06-30 03:34:54 +0400 |
| commit | b9def2da0052bc540b994bc1213d5d8c6dd551a4 (patch) | |
| tree | 626e4688fccd4516119c3de53f66163d4aa36f42 /scripts | |
| parent | 66db115621f69aa2b9a67cada7d8878a37c35492 (diff) | |
| parent | 47c527d3703e5e77e393ec909a2c65e6a1f89775 (diff) | |
| download | mariadb-git-b9def2da0052bc540b994bc1213d5d8c6dd551a4.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sunlight.local:/local_work/autopush/merge-4.1
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 |