Commit 8fd0e70c authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into lmy004.:/work/mysql-5.1-bug16412


sql/sql_show.cc:
  Auto merged
parents 4bef6225 5f214cf2

mysql-test/r/grant.result

+1 −1
Original line number Diff line number Diff line
@@ -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, 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

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct show_privileges_st sys_privileges[]= 
  {"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"},