bk commit into 5.0 tree (mjorgensen:1.2367)

[mmj]

Below is the list of changes that have just been committed into a local
5.0 repository of mjorgensen. When mjorgensen 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-12 00:10:18+01:00, mjorgensen@stripped +2 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-community
  MERGE: 1.2356.1.12

  configure.in@stripped, 2007-01-12 00:10:10+01:00, mjorgensen@stripped +0 -0
    Auto merged
    MERGE: 1.416.1.2

  sql/item_func.cc@stripped, 2007-01-12 00:10:10+01:00, mjorgensen@stripped +0 -0
    Auto merged
    MERGE: 1.318.1.1

# 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:	mjorgensen
# Host:	production.mysql.com
# Root:	/usersnfs/mjorgensen/bktrees/mysql-5.0-community/RESYNC

--- 1.419/configure.in	2007-01-12 00:10:28 +01:00
+++ 1.420/configure.in	2007-01-12 00:10:28 +01:00
@@ -713,6 +713,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

--- 1.320/sql/item_func.cc	2007-01-12 00:10:28 +01:00
+++ 1.321/sql/item_func.cc	2007-01-12 00:10:28 +01:00
@@ -3204,7 +3204,7 @@
     Structure is now initialized.  Try to get the lock.
     Set up control struct to allow others to abort locks
   */
-  thd->proc_info="User lock";
+  THD_PROC_INFO(thd, "User lock");
   thd->mysys_var->current_mutex= &LOCK_user_locks;
   thd->mysys_var->current_cond=  &ull->cond;
 
@@ -3229,7 +3229,7 @@
   }
   pthread_mutex_unlock(&LOCK_user_locks);
   pthread_mutex_lock(&thd->mysys_var->mutex);
-  thd->proc_info=0;
+  THD_PROC_INFO(thd, 0);
   thd->mysys_var->current_mutex= 0;
   thd->mysys_var->current_cond=  0;
   pthread_mutex_unlock(&thd->mysys_var->mutex);
@@ -3310,7 +3310,7 @@
     Structure is now initialized.  Try to get the lock.
     Set up control struct to allow others to abort locks.
   */
-  thd->proc_info="User lock";
+  THD_PROC_INFO(thd, "User lock");
   thd->mysys_var->current_mutex= &LOCK_user_locks;
   thd->mysys_var->current_cond=  &ull->cond;
 
@@ -3348,7 +3348,7 @@
   pthread_mutex_unlock(&LOCK_user_locks);
 
   pthread_mutex_lock(&thd->mysys_var->mutex);
-  thd->proc_info=0;
+  THD_PROC_INFO(thd, 0);
   thd->mysys_var->current_mutex= 0;
   thd->mysys_var->current_cond=  0;
   pthread_mutex_unlock(&thd->mysys_var->mutex);