bk commit into 5.0 tree (msvensson:1.1927)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1927 05/05/27 17:22:19 msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug9993
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/sql_parse.cc
    1.436 05/05/27 17:22:17 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/mysqld.cc
    1.459 05/05/27 17:22:16 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/mysql_priv.h
    1.301 05/05/27 17:22:15 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.300/sql/mysql_priv.h	2005-05-26 21:01:44 +02:00
+++ 1.301/sql/mysql_priv.h	2005-05-27 17:22:15 +02:00
@@ -1102,7 +1102,7 @@
 extern my_bool opt_readonly, lower_case_file_system;
 extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
 extern my_bool opt_secure_auth;
-extern my_bool sp_automatic_privileges;
+extern my_bool sp_automatic_privileges, opt_noacl;
 extern my_bool opt_old_style_user_limits, trust_routine_creators;
 extern uint opt_crash_binlog_innodb;
 extern char *shared_memory_base_name, *mysqld_unix_port;

--- 1.458/sql/mysqld.cc	2005-05-26 21:01:45 +02:00
+++ 1.459/sql/mysqld.cc	2005-05-27 17:22:16 +02:00
@@ -336,6 +336,7 @@
   changed). False otherwise.
 */
 volatile bool mqh_used = 0;
+my_bool opt_noacl;
 my_bool sp_automatic_privileges= 1;
 
 #ifdef HAVE_INITGROUPS
@@ -459,7 +460,7 @@
 /* Static variables */
 
 static bool kill_in_progress, segfaulted;
-static my_bool opt_do_pstack, opt_noacl, opt_bootstrap, opt_myisam_log;
+static my_bool opt_do_pstack, opt_bootstrap, opt_myisam_log;
 static int cleanup_done;
 static ulong opt_specialflag, opt_myisam_block_size;
 static char *opt_logname, *opt_update_logname, *opt_binlog_index_name;

--- 1.435/sql/sql_parse.cc	2005-05-26 20:00:20 +02:00
+++ 1.436/sql/sql_parse.cc	2005-05-27 17:22:17 +02:00
@@ -3991,7 +3991,7 @@
       lex->sphead= 0;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
       /* only add privileges if really neccessary */
-      if (sp_automatic_privileges &&
+      if (sp_automatic_privileges && !opt_noacl &&
           check_routine_access(thd, DEFAULT_CREATE_PROC_ACLS,
       			       db, name,
                                lex->sql_command == SQLCOM_CREATE_PROCEDURE, 1))
@@ -4260,7 +4260,7 @@
                                  lex->sql_command == SQLCOM_DROP_PROCEDURE, 0))
           goto error;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-	if (sp_automatic_privileges &&
+	if (sp_automatic_privileges && !opt_noacl &&
 	    sp_revoke_privileges(thd, db, name, 
                                  lex->sql_command == SQLCOM_DROP_PROCEDURE))
 	{