List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:January 24 2011 3:49pm
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3546 to 3547)
View as plain text  
 3547 Georgi Kodinov	2011-01-24 [merge]
      merge

    modified:
      mysql-test/r/grant.result
      sql/sql_show.cc
 3546 Georgi Kodinov	2011-01-24 [merge]
      merge

    modified:
      sql/sql_acl.cc
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2010-10-25 12:13:13 +0000
+++ b/mysql-test/r/grant.result	2011-01-24 15:47:16 +0000
@@ -594,6 +594,7 @@ Index	Tables	To create or drop indexes
 Insert	Tables	To insert data into tables
 Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
 Process	Server Admin	To view the plain text of currently executing queries
+Proxy	Server Admin	To make proxy user possible
 References	Databases,Tables	To have references on tables
 Reload	Server Admin	To reload or refresh tables, logs and privileges
 Replication client	Server Admin	To ask where the slave or master servers are

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2011-01-07 12:03:21 +0000
+++ b/sql/sql_show.cc	2011-01-24 15:47:16 +0000
@@ -336,6 +336,7 @@ static struct show_privileges_st sys_pri
   {"Insert", "Tables",  "To insert data into tables"},
   {"Lock tables","Databases","To use LOCK TABLES (together with SELECT privilege)"},
   {"Process", "Server Admin", "To view the plain text of currently executing queries"},
+  {"Proxy", "Server Admin", "To make proxy user possible"},
   {"References", "Databases,Tables", "To have references on tables"},
   {"Reload", "Server Admin", "To reload or refresh tables, logs and privileges"},
   {"Replication client","Server Admin","To ask where the slave or master servers are"},

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3546 to 3547) Georgi Kodinov24 Jan