bk commit into 5.1 tree (andrey:1.2110) BUG#16412

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2110 06/02/15 21:18:33 andrey@lmy004. +2 -0
  Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)
  WL#1034 (Internal CRON)

  sql/sql_show.cc
    1.306 06/02/15 21:18:25 andrey@lmy004. +1 -1
    Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information)

  mysql-test/r/grant.result
    1.49 06/02/15 21:18:25 andrey@lmy004. +1 -1
    fix result file

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug16412

--- 1.305/sql/sql_show.cc	2006-02-14 16:27:35 +01:00
+++ 1.306/sql/sql_show.cc	2006-02-15 21:18:25 +01:00
@@ -247,7 +247,7 @@ static struct show_privileges_st sys_pri
   {"Create user", "Server Admin",  "To create new users"},
   {"Delete", "Tables",  "To delete existing rows"},
   {"Drop", "Databases,Tables", "To drop databases, tables, and views"},
-  {"Event","Server Admin","Creation, alteration, deletion and execution of events."},
+  {"Event","Server Admin","To create and drop events"},
   {"Execute", "Functions,Procedures", "To execute stored routines"},
   {"File", "File access on server",   "To read and write files on the server"},
   {"Grant option",  "Databases,Tables,Functions,Procedures", "To give to other users
those privileges you possess"},

--- 1.48/mysql-test/r/grant.result	2006-02-01 11:28:40 +01:00
+++ 1.49/mysql-test/r/grant.result	2006-02-15 21:18:25 +01:00
@@ -448,7 +448,7 @@ Create view	Tables	To create new views
 Create user	Server Admin	To create new users
 Delete	Tables	To delete existing rows
 Drop	Databases,Tables	To drop databases, tables, and views
-Event	Server Admin	Creation, alteration, deletion and execution of events.
+Event	Server Admin	To create and drop events
 Execute	Functions,Procedures	To execute stored routines
 File	File access on server	To read and write files on the server
 Grant option	Databases,Tables,Functions,Procedures	To give to other users those
privileges you possess