bzr commit into mysql-5.0-bugteam branch (Sergey.Glukhov:2756) Bug#30305

[Sergey Glukhov]

#At file:///home/gluh/MySQL/mysql-5.0-bug-42758/ based on revid:sergey.glukhov@stripped

 2756 Sergey Glukhov	2009-02-24
      Bug#30305 Create routine in wrong context in SHOW PRIVILEGES
      Changed context of Create routine to Databases.
     @ mysql-test/r/sp.result
        result fix
     @ sql/sql_show.cc
        Changed context of Create routine to Databases.

    modified:
      mysql-test/r/sp.result
      sql/sql_show.cc
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2009-01-28 17:59:08 +0000
+++ b/mysql-test/r/sp.result	2009-02-24 12:08:48 +0000
@@ -2475,7 +2475,7 @@ Privilege	Context	Comment
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 Create	Databases,Tables,Indexes	To create new databases and tables
-Create routine	Functions,Procedures	To use CREATE FUNCTION/PROCEDURE
+Create routine	Databases	To use CREATE FUNCTION/PROCEDURE
 Create temporary tables	Databases	To use CREATE TEMPORARY TABLE
 Create view	Tables	To create new views
 Create user	Server Admin	To create new users
@@ -2527,7 +2527,7 @@ Privilege	Context	Comment
 Alter	Tables	To alter the table
 Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
 Create	Databases,Tables,Indexes	To create new databases and tables
-Create routine	Functions,Procedures	To use CREATE FUNCTION/PROCEDURE
+Create routine	Databases	To use CREATE FUNCTION/PROCEDURE
 Create temporary tables	Databases	To use CREATE TEMPORARY TABLE
 Create view	Tables	To create new views
 Create user	Server Admin	To create new users

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2009-02-24 11:58:16 +0000
+++ b/sql/sql_show.cc	2009-02-24 12:08:48 +0000
@@ -106,7 +106,7 @@ static struct show_privileges_st sys_pri
   {"Alter", "Tables",  "To alter the table"},
   {"Alter routine", "Functions,Procedures",  "To alter or drop stored functions/procedures"},
   {"Create", "Databases,Tables,Indexes",  "To create new databases and tables"},
-  {"Create routine","Functions,Procedures","To use CREATE FUNCTION/PROCEDURE"},
+  {"Create routine","Databases","To use CREATE FUNCTION/PROCEDURE"},
   {"Create temporary tables","Databases","To use CREATE TEMPORARY TABLE"},
   {"Create view", "Tables",  "To create new views"},
   {"Create user", "Server Admin",  "To create new users"},


Attachment: [text/bzr-bundle] bzr/[e-mail]