bzr commit into mysql-trunk-bugfixing branch (Georgi.Kodinov:3318)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B57916-trunk-bugfixing/ based on revid:georgi.kodinov@stripped

 3318 Georgi Kodinov	2010-11-03 [merge]
      merge

    modified:
      mysql-test/r/plugin_auth.result
      mysql-test/t/plugin_auth.test
=== 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: revision is a merge).