Commit 7b064953 authored by unknown's avatar unknown

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.
parent 4a4ec679
......@@ -441,18 +441,18 @@ fi
AC_SUBST(LD_VERSION_SCRIPT)
# Avoid bug in fcntl on some versions of linux
AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")
AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])
# Any wariation of Linux
if expr "$target_os" : "[[Ll]]inux.*" > /dev/null
then
MYSQLD_DEFAULT_SWITCHES="--skip-locking"
MYSQLD_DEFAULT_SWITCHES="--skip-external-locking"
TARGET_LINUX="true"
AC_MSG_RESULT("yes")
AC_MSG_RESULT([yes])
AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
else
MYSQLD_DEFAULT_SWITCHES=""
TARGET_LINUX="false"
AC_MSG_RESULT("no")
AC_MSG_RESULT([no])
fi
AC_SUBST(MYSQLD_DEFAULT_SWITCHES)
AC_SUBST(TARGET_LINUX)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment