diff options
| author | evgen@sunlight.local <> | 2006-06-30 03:34:54 +0400 |
|---|---|---|
| committer | evgen@sunlight.local <> | 2006-06-30 03:34:54 +0400 |
| commit | d126ca800cbeff70cc978bdb68b719a1ae388b68 (patch) | |
| tree | 626e4688fccd4516119c3de53f66163d4aa36f42 | |
| parent | 83bc48f38e3dd27d1c6b9fe1c7d8e6497709fd01 (diff) | |
| parent | 57e94d02c6c3d4b65690c33c78a3e625c9d37f6f (diff) | |
| download | mariadb-git-d126ca800cbeff70cc978bdb68b719a1ae388b68.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sunlight.local:/local_work/autopush/merge-4.1
| -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 7eadc5bd241..773ab7630bd 100644 --- a/configure.in +++ b/configure.in @@ -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) 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 |