Merge neptunus.(none):/home/msvensson/mysql/bug9993

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/view_skip_grants.result → mysql-test/r/skip_grants.result

 drop table if exists t1,v1;
 drop view if exists t1,v1;
+drop procedure if exists f1;
 use test;
 create table t1 (field1 INT);
 CREATE VIEW v1 AS SELECT field1 FROM t1;
 drop view v1;
+drop table t1;
+create procedure f1() select 1;
+drop procedure f1;

mysql-test/t/view_skip_grants.test → mysql-test/t/skip_grants.test

 --disable_warnings
 drop table if exists t1,v1;
 drop view if exists t1,v1;
+drop procedure if exists f1;
 --enable_warnings
 use test;
 
@@ -11,4 +12,11 @@ create table t1 (field1 INT);
 CREATE VIEW v1 AS SELECT field1 FROM t1;
 
 drop view v1;
-drop table t1
+drop table t1;
+
+#
+# Test that we can create and drop procedure without warnings
+# see bug#9993
+#
+create procedure f1() select 1;
+drop procedure f1;

sql/mysql_priv.h

@@ -1102,7 +1102,7 @@ extern my_bool opt_slave_compressed_protocol, use_temp_pool;
 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;

sql/mysqld.cc

@@ -336,6 +336,7 @@ my_bool opt_old_style_user_limits= 0, trust_routine_creators= 0;
   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 @@ char *master_ssl_ca, *master_ssl_capath, *master_ssl_cipher;
 /* 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;

sql/sql_parse.cc

@@ -3991,7 +3991,7 @@ mysql_execute_command(THD *thd)
       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 @@ mysql_execute_command(THD *thd)
                                  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))
 	{