summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <iggy@mysql.com>2006-06-27 18:07:23 -0400
committerunknown <iggy@mysql.com>2006-06-27 18:07:23 -0400
commit7b064953d2c62ebc8ec512fe5cc53066b56c4d7a (patch)
tree6ff3581e44c7cf8e4206291be7c3f437a3937ccc /scripts
parent4a4ec6795de503406a07fb3187ac838d61c16e06 (diff)
downloadmariadb-git-7b064953d2c62ebc8ec512fe5cc53066b56c4d7a.tar.gz
Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter
configure.in: Replaced skip-locking with newer skip-external-locking option. Removed extra quotes. scripts/mysqld_safe-watch.sh: Replaced skip-locking with newer skip-external-locking option.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe-watch.sh4
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