bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3117 to 3118) Bug#57916

[Georgi Kodinov]

 3118 Georgi Kodinov	2010-11-03
      Addendum to bug #57916 : fixed the test suite to be less environment 
      dependent.

    modified:
      mysql-test/r/plugin_auth.result
      mysql-test/t/plugin_auth.test
 3117 Georgi Kodinov	2010-11-02
      Bug #57916: Fix the naming of the proxy_priv table
      
      1. Fixed the name of the table to proxies_priv
      2. Fixed the column names to be of the form Capitalized_lowecarse instead of
      Capitalized_Capitalized
      3. Added Timestamp and Grantor columns
      4. Added tests to plugin_auth to check the table structure
      5. Updated the existing tests

    modified:
      mysql-test/r/1st.result
      mysql-test/r/connect.result
      mysql-test/r/information_schema.result
      mysql-test/r/log_tables_upgrade.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/system_mysql_db.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_key_column_usage.result
      mysql-test/suite/funcs_1/r/is_statistics.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result
      mysql-test/suite/funcs_1/r/is_table_constraints.result
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/t/plugin_auth.test
      mysql-test/t/system_mysql_db_fix40123.test
      mysql-test/t/system_mysql_db_fix50030.test
      mysql-test/t/system_mysql_db_fix50117.test
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_data.sql
      scripts/mysql_system_tables_fix.sql
      sql/sql_acl.cc
=== modified file 'mysql-test/r/plugin_auth.result'
--- a/mysql-test/r/plugin_auth.result	2010-11-02 15:45:26 +0000
+++ b/mysql-test/r/plugin_auth.result	2010-11-03 11:47:22 +0000
@@ -14,9 +14,9 @@ GRANT PROXY ON plug_dest TO plug;
 test proxies_priv columns
 SELECT * FROM mysql.proxies_priv;
 Host	User	Proxied_host	Proxied_user	With_grant	Grantor	Timestamp
-localhost	root			1		xx
-unknown	root			1		xx
-%	plug	%	plug_dest	0	root@localhost	xx
+xx	root			1		xx
+xx	root			1		xx
+xx	plug	%	plug_dest	0	root@localhost	xx
 test mysql.proxies_priv;
 SHOW CREATE TABLE mysql.proxies_priv;
 Table	Create Table

=== modified file 'mysql-test/t/plugin_auth.test'
--- a/mysql-test/t/plugin_auth.test	2010-11-02 15:45:26 +0000
+++ b/mysql-test/t/plugin_auth.test	2010-11-03 11:47:22 +0000
@@ -17,7 +17,7 @@ connect(plug_con,localhost,plug,plug_des
 
 GRANT PROXY ON plug_dest TO plug;
 --echo test proxies_priv columns
---replace_column 7 xx
+--replace_column 1 xx 7 xx
 SELECT * FROM mysql.proxies_priv;
 --echo test mysql.proxies_priv;
 SHOW CREATE TABLE mysql.proxies_priv;

No bundle (reason: useless for push emails).