10.0-base merge (roles)

1 files changed, 12 insertions, 13 deletions

diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test
index 366dc75c425..be07913137e 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -169,7 +169,7 @@ connection grant_plug_dest_con;
 --echo ## testing what an ordinary user can grant 
 --echo this should fail : no rights to grant all
 --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
-GRANT PROXY ON ''@'' TO grant_plug;
+GRANT PROXY ON ''@'%%' TO grant_plug;
 
 --echo this should fail : not the same user
 --error ER_ACCESS_DENIED_NO_PASSWORD_ERROR
@@ -212,11 +212,11 @@ disconnect grant_plug_dest_con;
 --echo # test what root can grant
 
 --echo should work : root has PROXY to all users
-GRANT PROXY ON ''@'' TO grant_plug;
-REVOKE PROXY ON ''@'' FROM grant_plug;
+GRANT PROXY ON ''@'%%' TO grant_plug;
+REVOKE PROXY ON ''@'%%' FROM grant_plug;
 
 --echo should work : root has PROXY to all users
-GRANT PROXY ON ''@'' TO proxy_admin IDENTIFIED BY 'test' 
+GRANT PROXY ON ''@'%%' TO proxy_admin IDENTIFIED BY 'test' 
   WITH GRANT OPTION;
 
 --echo need USAGE : PROXY doesn't contain it.
@@ -226,7 +226,7 @@ connect (proxy_admin_con,localhost,proxy_admin,test);
 connection proxy_admin_con;
 --echo in proxy_admin_con;
 
---echo should work : proxy_admin has proxy to ''@''
+--echo should work : proxy_admin has proxy to ''@'%%'
 GRANT PROXY ON future_user TO grant_plug;
 
 connection default;
@@ -318,9 +318,9 @@ DROP USER plug_dest;
 --echo #
 
 GRANT ALL PRIVILEGES ON *.* TO power_user;
-GRANT USAGE ON anonymous_db.* TO ''@''
+GRANT USAGE ON anonymous_db.* TO ''@'%%'
   IDENTIFIED WITH 'test_plugin_server' AS 'power_user';
-GRANT PROXY ON power_user TO ''@'';
+GRANT PROXY ON power_user TO ''@'%%';
 CREATE DATABASE confidential_db;
 
 connect(plug_con,localhost, test_login_user, power_user, confidential_db);
@@ -330,24 +330,23 @@ connection default;
 disconnect plug_con;
 
 DROP USER power_user;
-DROP USER ''@'';
+DROP USER ''@'%%';
 DROP DATABASE confidential_db;
 
 --echo # Test case #2 (crash with double grant proxy)
 
-CREATE USER ''@'' IDENTIFIED WITH 'test_plugin_server' AS 'standard_user';
+CREATE USER ''@'%%' IDENTIFIED WITH 'test_plugin_server' AS 'standard_user';
 CREATE USER standard_user;
 CREATE DATABASE shared;
 GRANT ALL PRIVILEGES ON shared.* TO standard_user;
-GRANT PROXY ON standard_user TO ''@'';
+GRANT PROXY ON standard_user TO ''@'%%';
 --echo #should not crash
-GRANT PROXY ON standard_user TO ''@'';
+GRANT PROXY ON standard_user TO ''@'%%';
 
-DROP USER ''@'';
+DROP USER ''@'%%';
 DROP USER standard_user;
 DROP DATABASE shared;
 
-
 --echo #
 --echo # Bug #57551 : Live upgrade fails between 5.1.52 -> 5.5.7-rc
 --echo #