bk commit into 4.1 tree (iggy:1.2517) BUG#19298

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
4.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2517 06/06/27 18:07:23 iggy@stripped +2 -0
  Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter

  scripts/mysqld_safe-watch.sh
    1.6 06/06/27 18:07:20 iggy@stripped +2 -2
    Replaced skip-locking with newer skip-external-locking option.

  configure.in
    1.412 06/06/27 18:07:19 iggy@stripped +4 -4
    Replaced skip-locking with newer skip-external-locking option.  Removed extra quotes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-4.1_bug19298

--- 1.411/configure.in	2006-05-26 12:31:20 -04:00
+++ 1.412/configure.in	2006-06-27 18:07:19 -04:00
@@ -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)

--- 1.5/scripts/mysqld_safe-watch.sh	2001-06-28 03:49:15 -04:00
+++ 1.6/scripts/mysqld_safe-watch.sh	2006-06-27 18:07:20 -04:00
@@ -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