bk commit into 5.1 tree (jon:1.2527)

[Jon Stephens]

Below is the list of changes that have just been committed into a local
5.1 repository of jon. When jon 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@stripped, 2007-06-19 18:52:09+02:00, jon@stripped +1 -0
  Minor wording changes / test

  BUILD/build_source.sh@stripped, 2007-06-19 18:41:19+02:00, jon@stripped +20 -20
    Wording change: "extensive" -> "extended"

# 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:	jon
# Host:	biollante.ndb.mysql.com
# Root:	/home/jon/bk/wl3834

--- 1.19/BUILD/build_source.sh	2007-06-14 22:46:28 +02:00
+++ 1.20/BUILD/build_source.sh	2007-06-19 18:41:19 +02:00
@@ -16,11 +16,11 @@
 
 usage()
 {
-cat <<EOF 
+cat <<EOF
 Usage: $0 [options]
   -h, --help              Show this help message.
-  --with-help             Show extensive help on --with-xxx options to configure
-  --extensive-help        Show extensive help message
+  --with-help             Show extended help on --with-xxx options to configure
+  --extended-help        Show extended help message
   --with-debug            Build debug version
   --with-debug=full       Build with full debug.
   -c, --just-configure    Stop after running configure.
@@ -51,10 +51,10 @@
   fi
 }
 
-extensive_usage()
+extended_usage()
 {
   cat <<EOF
-  Extensive help text on this script:
+  Extended help text on this script:
   -----------------------------------
   The script will automatically detect CPU type, operating system. In most cases this
   will decide also on the compiler. Only on Linux/x86 there is a choice of using
@@ -95,7 +95,7 @@
     a commercial license (e.g. the readline library)
   --with-debug[=full]
     This option will ensure that the version is built with debug information enabled,
-    the optimisation level is decreased to -O and 
+    the optimisation level is decreased to -O and
   --developer
     This flag changes a number of things to make the version built more appropriate
     for developers and their needs of debugging and testing capabilities. It also
@@ -251,7 +251,7 @@
 {
   cat <<EOF
 
-  To get an extensive help on the various with options one should run this script
+  To get extended help on the various with options one should run this script
   with --just-configure to create a configure file. Then issue the command
   ./configure --help and you'll get an extensive list of configure options
   available.
@@ -453,8 +453,8 @@
       with_usage
       exit 0
       ;;
-    --extensive-help | --extensive_help )
-      extensive_usage
+    --extended-help | --extended_help )
+      extended_usage
       exit 0
       ;;
     -h | --help | -help )
@@ -508,7 +508,7 @@
     fi
 
     # parse CPU flags
-    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do 
+    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do
       eval cpu_flag_$flag=yes
     done
   else
@@ -537,7 +537,7 @@
     esac
   fi
 
-  # detect CPU shortname as used by gcc options 
+  # detect CPU shortname as used by gcc options
   # this list is not complete, feel free to add further entries
   cpu_arg=""
   case "$cpu_family--$model_name" in
@@ -549,7 +549,7 @@
     # Intel ia32
     *Intel*Core*|*X[eE][oO][nN]*)
       # a Xeon is just another pentium4 ...
-      # ... unless it has the "lm" (long-mode) flag set, 
+      # ... unless it has the "lm" (long-mode) flag set,
       # in that case it's a Xeon with EM64T support
       # So is Intel Core.
       if [ -z "$cpu_flag_lm" ]; then
@@ -605,12 +605,12 @@
     *i386*)
       cpu_arg=i386
       ;;
-    # MacOSX / Intel  
+    # MacOSX / Intel
     *i386*i486*)
       cpu_arg="pentium-m";
       os="MacOSX"
       ;;
-    #Core 2 Duo  
+    #Core 2 Duo
     *Intel*Core\(TM\)2*)
       cpu_arg="nocona";
       ;;
@@ -629,7 +629,7 @@
     *ppc*)
       cpu_arg='powerpc'
       ;;
-   
+
     *powerpc*)
       cpu_arg='powerpc'
       ;;
@@ -724,7 +724,7 @@
 
   while [ "$cpu_arg" ] ; do
     printf "testing $cpu_arg ... " >&2
-          
+
     # compile check
     #check_cpu_cflags=`eval echo $check_cpu_args`
     check_cpu_flags="$check_cpu_args"
@@ -740,7 +740,7 @@
     # this list is not complete, feel free to add further entries
     case "$cpu_arg" in
       # Intel ia32
-      nocona)     cpu_arg=pentium4    ;; 
+      nocona)     cpu_arg=pentium4    ;;
       prescott)   cpu_arg=pentium4    ;;
       pentium4m)  cpu_arg=pentium4    ;;
       pentium4)   cpu_arg=pentium3    ;;
@@ -810,7 +810,7 @@
     echo "Discovered a Intel Core 2 Duo architecture or later"
   fi
 }
- 
+
 init_commands()
 {
   commands="\
@@ -905,7 +905,7 @@
 #
 # Check for the CPU and set up CPU specific flags. We may reset them
 # later.
-# 
+#
 path=`dirname $0`
 check_cpu
 
@@ -1021,7 +1021,7 @@
 # partitioning (included as part of MySQL Cluster storage
 # engine as well). These are added in all packages except
 # the classic package.
-# 
+#
 engine_configs="$engine_configs --with-archive-storage-engine"
 engine_configs="$engine_configs --with-blackhole-storage-engine"
 engine_configs="$engine_configs --with-example-storage-engine"