bk commit into 5.0 tree (gluh:1.1987) BUG#11577

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.1987 05/06/29 13:31:44 gluh@stripped +3 -0
  Bug#11577 'show procedure/function status' doesn't work for user with limited access
    changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines

  sql/sql_parse.cc
    1.462 05/06/29 13:30:42 gluh@stripped +6 -4
    Bug#11577 'show procedure/function status' doesn't work for user with limited access
      changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines

  mysql-test/t/information_schema.test
    1.41 05/06/29 13:30:42 gluh@stripped +2 -0
    Bug#11577 'show procedure/function status' doesn't work for user with limited access

  mysql-test/r/information_schema.result
    1.58 05/06/29 13:30:42 gluh@stripped +3 -0
    Bug#11577 'show procedure/function status' doesn't work for user with limited access

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.11577

--- 1.461/sql/sql_parse.cc	Mon Jun 27 17:26:04 2005
+++ 1.462/sql/sql_parse.cc	Wed Jun 29 13:30:42 2005
@@ -2383,10 +2383,12 @@
     select_result *result=lex->result;
     if (all_tables)
     {
-      res= check_table_access(thd,
-			      lex->exchange ? SELECT_ACL | FILE_ACL :
-			      SELECT_ACL,
-			      all_tables, 0);
+      if (lex->orig_sql_command != SQLCOM_SHOW_STATUS_PROC &&
+          lex->orig_sql_command != SQLCOM_SHOW_STATUS_FUNC)
+        res= check_table_access(thd,
+                                lex->exchange ? SELECT_ACL | FILE_ACL :
+                                SELECT_ACL,
+                                all_tables, 0);
     }
     else
       res= check_access(thd,

--- 1.57/mysql-test/r/information_schema.result	Thu Jun 16 13:27:17 2005
+++ 1.58/mysql-test/r/information_schema.result	Wed Jun 29 13:30:42 2005
@@ -295,6 +295,9 @@
 Function	sql_mode	Create Function
 sub2		CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
 return i+1
+show function status like "sub2";
+Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+test	sub2	FUNCTION	mysqltest_1@localhost	#	#	DEFINER	
 drop function sub2;
 show create procedure sel2;
 Procedure	sql_mode	Create Procedure

--- 1.40/mysql-test/t/information_schema.test	Thu Jun 16 13:27:17 2005
+++ 1.41/mysql-test/t/information_schema.test	Wed Jun 29 13:30:42 2005
@@ -151,6 +151,8 @@
 show create procedure sel2;
 show create function sub1;
 show create function sub2;
+--replace_column 5 # 6 #
+show function status like "sub2";
 connection default;
 disconnect user1;
 drop function sub2;