bk commit into 5.0 tree (kent:1.2360)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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-01-10 18:19:51+01:00, kent@stripped +1 -0
  configure.in:
    Corrected default for --disable-grant-options

  configure.in@stripped, 2007-01-10 18:19:40+01:00, kent@stripped +5 -5
    Corrected default for --disable-grant-options

# 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:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/sage/mysql-5.0-sage

--- 1.413/configure.in	2007-01-10 18:19:54 +01:00
+++ 1.414/configure.in	2007-01-10 18:19:54 +01:00
@@ -713,19 +713,19 @@
   AC_MSG_RESULT([no])
 fi
 
-# If we should allow init-file and skip-grant-table options
-AC_MSG_CHECKING(If we should should enable init-file and skip-grant-table options)
+# If we should allow init-file, skip-grant-table and bootstrap options
+AC_MSG_CHECKING(If we should should enable init-file, skip-grant-table options and
bootstrap)
 AC_ARG_ENABLE(grant-options,
-    [  --disable-grant-options Disables the use of --init-file and --skip-grant-tables
options],
+    [  --disable-grant-options Disables the use of --init-file, --skip-grant-tables and
--bootstrap options],
     [ mysql_grant_options_enabled=$enableval ],
-    [ mysql_grant_options_enabled=no ]
+    [ mysql_grant_options_enabled=yes ]
     )
 if test "$mysql_grant_options_enabled" = "yes"
 then
   AC_MSG_RESULT([yes])
 else
   AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],
-            [Disables the use of --init-file and --skip-grant-tables options])
+            [Disables the use of --init-file, --skip-grant-tables and --bootstrap
options])
   AC_MSG_RESULT([no])
 fi