bk commit into 5.0 tree (jimw:1.1957) BUG#14495

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1957 05/11/16 16:01:29 jimw@stripped +6 -0
  Stamp out some stray instances of deprecated 'skip-locking' (Bug #14495)

  support-files/my-small.cnf.sh
    1.21 05/11/16 16:01:25 jimw@stripped +1 -1
    Use skip-external-locking instead of deprecated skip-locking

  support-files/my-medium.cnf.sh
    1.23 05/11/16 16:01:25 jimw@stripped +1 -1
    Use skip-external-locking instead of deprecated skip-locking

  support-files/my-large.cnf.sh
    1.24 05/11/16 16:01:24 jimw@stripped +1 -1
    Use skip-external-locking instead of deprecated skip-locking

  support-files/my-huge.cnf.sh
    1.25 05/11/16 16:01:24 jimw@stripped +1 -1
    Use skip-external-locking instead of deprecated skip-locking

  scripts/mysqld_safe-watch.sh
    1.6 05/11/16 16:01:24 jimw@stripped +2 -2
    Use --skip-external-locking instead of deprecated --skip-locking

  configure.in
    1.360 05/11/16 16:01:23 jimw@stripped +2 -2
    Use --skip-external-locking instead of deprecated --skip-locking

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-14495

--- 1.359/configure.in	2005-10-28 02:41:27 -07:00
+++ 1.360/configure.in	2005-11-16 16:01:23 -08:00
@@ -359,11 +359,11 @@
 MYSQL_PROG_AR
 
 # 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_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])

--- 1.5/scripts/mysqld_safe-watch.sh	2001-06-28 00:49:15 -07:00
+++ 1.6/scripts/mysqld_safe-watch.sh	2005-11-16 16:01:24 -08:00
@@ -93,10 +93,10 @@
   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

--- 1.24/support-files/my-huge.cnf.sh	2005-10-31 01:42:28 -08:00
+++ 1.25/support-files/my-huge.cnf.sh	2005-11-16 16:01:24 -08:00
@@ -25,7 +25,7 @@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer = 384M
 max_allowed_packet = 1M
 table_cache = 512

--- 1.23/support-files/my-large.cnf.sh	2005-10-31 01:42:29 -08:00
+++ 1.24/support-files/my-large.cnf.sh	2005-11-16 16:01:24 -08:00
@@ -25,7 +25,7 @@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer = 256M
 max_allowed_packet = 1M
 table_cache = 256

--- 1.22/support-files/my-medium.cnf.sh	2005-01-10 15:15:58 -08:00
+++ 1.23/support-files/my-medium.cnf.sh	2005-11-16 16:01:25 -08:00
@@ -26,7 +26,7 @@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer = 16M
 max_allowed_packet = 1M
 table_cache = 64

--- 1.20/support-files/my-small.cnf.sh	2005-01-10 15:15:58 -08:00
+++ 1.21/support-files/my-small.cnf.sh	2005-11-16 16:01:25 -08:00
@@ -26,7 +26,7 @@
 [mysqld]
 port		= @MYSQL_TCP_PORT@
 socket		= @MYSQL_UNIX_ADDR@
-skip-locking
+skip-external-locking
 key_buffer = 16K
 max_allowed_packet = 1M
 table_cache = 4