bk commit into 5.1 tree (kent:1.2392)

[kent]

Below is the list of changes that have just been committed into a local
5.1 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-15 10:29:55+01:00, kent@kent-amd64.(none) +1 -0
  Merge kboortz@stripped:/home/bk/mysql-5.1-build
  into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
  MERGE: 1.2372.1.15

  configure.in@stripped, 2007-01-15 10:29:51+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.412.1.3

# 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/tmp2/mysql-5.1-build/RESYNC

--- 1.413/configure.in	2007-01-15 10:30:00 +01:00
+++ 1.414/configure.in	2007-01-15 10:30:00 +01:00
@@ -678,7 +678,22 @@
   AC_MSG_RESULT([no])
 fi
 
-  
+# 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, --skip-grant-tables and
--bootstrap options],
+    [ mysql_grant_options_enabled=$enableval ],
+    [ 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, --skip-grant-tables and --bootstrap
options])
+  AC_MSG_RESULT([no])
+fi
+
 MYSQL_SYS_LARGEFILE
 
 # Types that must be checked AFTER large file support is checked