bk commit into 5.0 tree (gluh:1.2227) BUG#14564

[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@stripped, 2006-08-24 16:24:43+05:00, gluh@stripped +3 -0
  Bug#14564 show create function has a blank field
  issue a warning if user does not have enough rights to 
  get full information about routine.

  mysql-test/r/information_schema.result@stripped, 2006-08-24 16:24:38+05:00, gluh@stripped +8 -0
    Bug#14564 show create function has a blank field
    result fix

  sql/share/errmsg.txt@stripped, 2006-08-24 16:24:38+05:00, gluh@stripped +2 -0
    Bug#14564 show create function has a blank field
    new message

  sql/sp_head.cc@stripped, 2006-08-24 16:24:38+05:00, gluh@stripped +12 -0
    Bug#14564 show create function has a blank field
    issue a warning if user does not have enough rights to 
    get full information about routine.

# 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:	gluh.(none)
# Root:	/home/gluh/MySQL/Bugs/5.0.14564

--- 1.66/sql/share/errmsg.txt	2006-08-24 16:24:56 +05:00
+++ 1.67/sql/share/errmsg.txt	2006-08-24 16:24:56 +05:00
@@ -5623,3 +5623,5 @@
 	eng "Triggers can not be created on system tables"
 ER_REMOVED_SPACES
         eng "Leading spaces are removed from name '%s'"
+ER_SHOW_ROUTINE_BODY
+        eng "Can't get full information about %-.10s '%-.64s'. Not enough rights."

--- 1.111/mysql-test/r/information_schema.result	2006-08-24 16:24:56 +05:00
+++ 1.112/mysql-test/r/information_schema.result	2006-08-24 16:24:56 +05:00
@@ -311,9 +311,13 @@
 show create procedure sel2;
 Procedure	sql_mode	Create Procedure
 sel2		NULL
+Warnings:
+Warning	1467	Can't get full information about procedure 'sel2'. Not enough rights.
 show create function sub1;
 Function	sql_mode	Create Function
 sub1		NULL
+Warnings:
+Warning	1467	Can't get full information about function 'sub1'. Not enough rights.
 show create function sub2;
 Function	sql_mode	Create Function
 sub2		CREATE DEFINER=`mysqltest_1`@`localhost` FUNCTION `sub2`(i int) RETURNS int(11)
@@ -1160,9 +1164,13 @@
 SHOW CREATE PROCEDURE p1;
 Procedure	sql_mode	Create Procedure
 p1		NULL
+Warnings:
+Warning	1467	Can't get full information about procedure 'p1'. Not enough rights.
 SHOW CREATE FUNCTION f1;
 Function	sql_mode	Create Function
 f1		NULL
+Warnings:
+Warning	1467	Can't get full information about function 'f1'. Not enough rights.
 CALL p1();
 SELECT f1();
 f1()

--- 1.218/sql/sp_head.cc	2006-08-24 16:24:56 +05:00
+++ 1.219/sql/sp_head.cc	2006-08-24 16:24:56 +05:00
@@ -1883,7 +1883,13 @@
   if (full_access)
     protocol->store(m_defstr.str, m_defstr.length, system_charset_info);
   else
+  {
+    push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
+                        ER_SHOW_ROUTINE_BODY,
+                        ER(ER_SHOW_ROUTINE_BODY),
+                        "procedure", m_name.str);
     protocol->store_null();
+  }
   res= protocol->write();
   send_eof(thd);
 
@@ -1953,7 +1959,13 @@
   if (full_access)
     protocol->store(m_defstr.str, m_defstr.length, system_charset_info);
   else
+  {
+    push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
+                        ER_SHOW_ROUTINE_BODY,
+                        ER(ER_SHOW_ROUTINE_BODY),
+                        "function", m_name.str);
     protocol->store_null();
+  }
   res= protocol->write();
   send_eof(thd);