diff options
| author | unknown <elliot@mysql.com> | 2006-06-30 00:14:25 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-06-30 00:14:25 -0400 |
| commit | 7f74319236e8dbd3b996aea3106023a7c9280861 (patch) | |
| tree | c217327958e474bf5d2adea3669b988e428409b8 /scripts | |
| parent | 673bb07d8f63d9012f68e64e2b56e783b1a780ae (diff) | |
| parent | b9def2da0052bc540b994bc1213d5d8c6dd551a4 (diff) | |
| download | mariadb-git-7f74319236e8dbd3b996aea3106023a7c9280861.tar.gz | |
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
configure.in:
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 |