From: Dmitry Lenev
Date: April 22 2011 11:36am
Subject: bzr commit into mysql-trunk branch (Dmitry.Lenev:3334) Bug#11759114
List-Archive: http://lists.mysql.com/commits/135950
X-Bug: 11759114
Message-Id: <20110422113615.8BE107404B6@bandersnatch>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1372901501=="

--===============1372901501==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/dlenev/src/bzr/mysql-trunk-11759114/ based on revid:vasil.dimov@stripped

 3334 Dmitry Lenev	2011-04-22
      Fix for bug#11759114 - '51401: GRANT TREATS NONEXISTENT 
      FUNCTIONS/PRIVILEGES DIFFERENTLY'.
      
      The problem was that attempt to grant EXECUTE or ALTER 
      ROUTINE privilege on stored procedure which didn't exist 
      succeed instead of returning an appropriate error like 
      it happens in similar situation for stored functions or 
      tables.
      
      The code which handles granting of privileges on individual 
      routine calls sp_exist_routines() function to check if routine 
      exists and assumes that the 3rd parameter of the latter 
      specifies whether it should check for existence of stored 
      procedure or function. In practice, this parameter had 
      completely different meaning and, as result, this check was 
      not done properly for stored procedures.
      
      This fix addresses this problem by bringing sp_exist_routines()
      signature and code in line with expectation of its caller.
     @ mysql-test/r/grant.result
        Added test coverage for bug#11759114 - '51401: GRANT TREATS
        NONEXISTENT FUNCTIONS/PRIVILEGES DIFFERENTLY'.
     @ mysql-test/t/grant.test
        Added test coverage for bug#11759114 - '51401: GRANT TREATS
        NONEXISTENT FUNCTIONS/PRIVILEGES DIFFERENTLY'.
     @ sql/sp.cc
        Changed meaning of the 3rd parameter in sp_exist_routines()
        function. Now it specifies whether list of routine names
        which is passed to this function contains names of stored
        procedures or functions. This brings sp_exist_routines() in
        line with assumption made by the code which calls it.
     @ sql/sp.h
        Changed meaning of the 3rd parameter in sp_exist_routines()
        function. Now it specifies whether list of routine names
        which is passed to this function contains names of stored
        procedures or functions. This brings sp_exist_routines() in
        line with assumption made by the code which calls it.

    modified:
      mysql-test/r/grant.result
      mysql-test/t/grant.test
      sql/sp.cc
      sql/sp.h
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2011-03-18 14:58:27 +0000
+++ b/mysql-test/r/grant.result	2011-04-22 11:36:08 +0000
@@ -1700,6 +1700,7 @@ Assigning privileges without procs_priv 
 CREATE DATABASE mysqltest1;
 CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER
 SELECT 1;
+CREATE FUNCTION mysqltest1.test() RETURNS INT RETURN 1;
 GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost;
 ERROR 42S02: Table 'mysql.procs_priv' doesn't exist
 GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;
@@ -2536,3 +2537,25 @@ DROP USER mysqltest_u1@localhost;
 
 # End of Bug#38347.
 
+#
+# BUG#11759114 - '51401: GRANT TREATS NONEXISTENT FUNCTIONS/PRIVILEGES
+#                 DIFFERENTLY'.
+#
+drop database if exists mysqltest_db1;
+create database mysqltest_db1;
+create user mysqltest_u1;
+# Both GRANT statements below should fail with the same error.
+grant execute on function mysqltest_db1.f1 to mysqltest_u1;
+ERROR 42000: FUNCTION or PROCEDURE f1 does not exist
+grant execute on procedure mysqltest_db1.p1 to mysqltest_u1;
+ERROR 42000: FUNCTION or PROCEDURE p1 does not exist
+# Let us show that GRANT behaviour for routines is consistent
+# with GRANT behaviour for tables. Attempt to grant privilege
+# on non-existent table also results in an error.
+grant select on mysqltest_db1.t1 to mysqltest_u1;
+ERROR 42S02: Table 'mysqltest_db1.t1' doesn't exist
+show grants for mysqltest_u1;
+Grants for mysqltest_u1@%
+GRANT USAGE ON *.* TO 'mysqltest_u1'@'%'
+drop database mysqltest_db1;
+drop user mysqltest_u1;

=== modified file 'mysql-test/t/grant.test'
--- a/mysql-test/t/grant.test	2011-03-17 11:33:17 +0000
+++ b/mysql-test/t/grant.test	2011-04-22 11:36:08 +0000
@@ -1676,6 +1676,7 @@ FLUSH PRIVILEGES;
 CREATE DATABASE mysqltest1;
 CREATE PROCEDURE mysqltest1.test() SQL SECURITY DEFINER
   SELECT 1;
+CREATE FUNCTION mysqltest1.test() RETURNS INT RETURN 1;
 --error ER_NO_SUCH_TABLE
 GRANT EXECUTE ON FUNCTION mysqltest1.test TO mysqltest_1@localhost;
 GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;
@@ -2187,3 +2188,27 @@ DROP USER mysqltest_u1@localhost;
 --echo
 --echo # End of Bug#38347.
 --echo
+
+
+--echo #
+--echo # BUG#11759114 - '51401: GRANT TREATS NONEXISTENT FUNCTIONS/PRIVILEGES
+--echo #                 DIFFERENTLY'.
+--echo #
+--disable_warnings
+drop database if exists mysqltest_db1;
+--enable_warnings
+create database mysqltest_db1;
+create user mysqltest_u1;
+--echo # Both GRANT statements below should fail with the same error.
+--error ER_SP_DOES_NOT_EXIST
+grant execute on function mysqltest_db1.f1 to mysqltest_u1;
+--error ER_SP_DOES_NOT_EXIST
+grant execute on procedure mysqltest_db1.p1 to mysqltest_u1;
+--echo # Let us show that GRANT behaviour for routines is consistent
+--echo # with GRANT behaviour for tables. Attempt to grant privilege
+--echo # on non-existent table also results in an error.
+--error ER_NO_SUCH_TABLE
+grant select on mysqltest_db1.t1 to mysqltest_u1;
+show grants for mysqltest_u1;
+drop database mysqltest_db1;
+drop user mysqltest_u1;

=== modified file 'sql/sp.cc'
--- a/sql/sp.cc	2011-03-09 20:54:55 +0000
+++ b/sql/sp.cc	2011-04-22 11:36:08 +0000
@@ -1696,7 +1696,8 @@ sp_find_routine(THD *thd, int type, sp_n
 
   @param thd Thread handler
   @param routines List of needles in the hay stack
-  @param any Any of the needles are good enough
+  @param is_proc  Indicates whether routines in the list are procedures
+                  or functions.
 
   @return
     @retval FALSE Found.
@@ -1704,7 +1705,7 @@ sp_find_routine(THD *thd, int type, sp_n
 */
 
 bool
-sp_exist_routines(THD *thd, TABLE_LIST *routines, bool any)
+sp_exist_routines(THD *thd, TABLE_LIST *routines, bool is_proc)
 {
   TABLE_LIST *routine;
   bool sp_object_found;
@@ -1720,17 +1721,14 @@ sp_exist_routines(THD *thd, TABLE_LIST *
     lex_name.str= thd->strmake(routine->table_name, lex_name.length);
     name= new sp_name(lex_db, lex_name, true);
     name->init_qname(thd);
-    sp_object_found= sp_find_routine(thd, TYPE_ENUM_PROCEDURE, name,
-                                     &thd->sp_proc_cache, FALSE) != NULL ||
-                     sp_find_routine(thd, TYPE_ENUM_FUNCTION, name,
-                                     &thd->sp_func_cache, FALSE) != NULL;
+    sp_object_found= is_proc ? sp_find_routine(thd, TYPE_ENUM_PROCEDURE,
+                                               name, &thd->sp_proc_cache,
+                                               FALSE) != NULL :
+                               sp_find_routine(thd, TYPE_ENUM_FUNCTION,
+                                               name, &thd->sp_func_cache,
+                                               FALSE) != NULL;
     thd->warning_info->clear_warning_info(thd->query_id);
-    if (sp_object_found)
-    {
-      if (any)
-        break;
-    }
-    else if (!any)
+    if (! sp_object_found)
     {
       my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION or PROCEDURE",
                routine->table_name);

=== modified file 'sql/sp.h'
--- a/sql/sp.h	2011-03-09 20:54:55 +0000
+++ b/sql/sp.h	2011-04-22 11:36:08 +0000
@@ -110,7 +110,7 @@ sp_cache_routine(THD *thd, int type, sp_
                  bool lookup_only, sp_head **sp);
 
 bool
-sp_exist_routines(THD *thd, TABLE_LIST *procs, bool any);
+sp_exist_routines(THD *thd, TABLE_LIST *procs, bool is_proc);
 
 bool
 sp_show_create_routine(THD *thd, int type, sp_name *name);


--===============1372901501==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.lenev@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.lenev@stripped
# target_branch: file:///home/dlenev/src/bzr/mysql-trunk-11759114/
# testament_sha1: 250af119b6a13eb5077de3cf6615254fad7e195f
# timestamp: 2011-04-22 15:36:15 +0400
# base_revision_id: vasil.dimov@stripped\
#   vga61crkz2sztp05
# 
# Begin bundle
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
uSKcKEggCKRGgA==


--===============1372901501==--