bk commit into 5.1 tree (andrey:1.2168)

[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.2168 06/02/24 11:56:16 andrey@lmy004. +1 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-new
  into lmy004.:/work/mysql-5.1-bug16412

  sql/sql_show.cc
    1.310 06/02/24 11:56:10 andrey@lmy004. +0 -0
    Auto merged

# 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/RESYNC

--- 1.309/sql/sql_show.cc	2006-02-21 17:29:30 +01:00
+++ 1.310/sql/sql_show.cc	2006-02-24 11:56:10 +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, alter, drop and execute 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"},