From d59ff2764c3258a18c8555a761aedfc82ada270f Mon Sep 17 00:00:00 2001
From: "gluh@eagle.intranet.mysql.r18.ru" <>
Date: Tue, 19 Jul 2005 13:49:43 +0500
Subject: [PATCH] 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/r/information_schema.result |  3 +++
 mysql-test/t/information_schema.test   |  2 ++
 sql/sql_parse.cc                       | 10 ++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 98f3d59485f..a0ad743ac2a 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -298,6 +298,9 @@ show create function sub2;
 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
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 7c0624b67fd..0ac68c37d15 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -157,6 +157,8 @@ select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;
 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;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d8c7507fd35..11d71d5603b 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2386,10 +2386,12 @@ mysql_execute_command(THD *thd)
     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,