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 | 29423c2d27092948fd950e827bbdf17226cfcb58 (patch) | |
| tree | c217327958e474bf5d2adea3669b988e428409b8 | |
| parent | a14c9ddf2b978381e8a35a740333080984bd4c3c (diff) | |
| parent | 2a100c1c5cdd9a07be1859e6cc4ed60d32cfba0d (diff) | |
| download | mariadb-git-29423c2d27092948fd950e827bbdf17226cfcb58.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
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | scripts/mysqld_safe-watch.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 48454a11309..1605be324c8 100644 --- a/configure.in +++ b/configure.in @@ -382,18 +382,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 variation 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) 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 |