bzr push into mysql-5.5 branch (Georgi.Kodinov:3272 to 3273) Bug#59275

[Georgi Kodinov]

 3273 Georgi Kodinov	2011-01-14
      Bug #59275: SHOW PRIVILEGES doesn't have an entry for the PROXY privilege
      
      Added the privilege to the SHOW command.

    modified:
      mysql-test/r/grant.result
      sql/sql_show.cc
 3272 Georgi Kodinov	2011-01-14
      Bug #59453: Non-ASCIIZ string kills protocol extensibility in MySQL 5.5
      
      When the server sends the name of the plugin it's using in the handshake 
      packet it was null terminating it in it's buffer, but was sending a length of 
      the packet 1 byte short.
      Fixed to send the terminating 0 as well by increasing the length of the 
      packet to include it. 
      In this way the handshake packet becomes similar to the change user packet
      where the plugin name is null terminated.
      No test suite added as the fix can only be observed by analyzing the bytes
      sent over the wire.

    modified:
      sql/sql_acl.cc
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2010-10-19 09:26:45 +0000
+++ b/mysql-test/r/grant.result	2011-01-14 14:57:13 +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 11:56:50 +0000
+++ b/sql/sql_show.cc	2011-01-14 14:57:13 +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).