MDEV-5215 prerequisite: remove test and test_* database hacks in the test suitebb-10.10-no_hack

1 files changed, 15 insertions, 15 deletions

diff --git a/mysql-test/main/plugin_auth.test b/mysql-test/main/plugin_auth.test
index 30e4fa6e0ad..82b116e2cc1 100644
--- a/mysql-test/main/plugin_auth.test
+++ b/mysql-test/main/plugin_auth.test
@@ -17,7 +17,7 @@ SELECT plugin,authentication_string FROM mysql.user WHERE User='plug';
 --echo ## test plugin auth
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 --error ER_ACCESS_DENIED_ERROR : this should fail : no grant
-connect(plug_con,localhost,plug,plug_dest);
+connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*");
 
 GRANT PROXY ON plug_dest TO plug;
 --echo test proxies_priv columns
@@ -26,7 +26,7 @@ SELECT * FROM mysql.proxies_priv WHERE user !='root';
 --echo test mysql.proxies_priv;
 SHOW CREATE TABLE mysql.proxies_priv;
 
-connect(plug_con,localhost,plug,plug_dest);
+connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*");
 select USER(),CURRENT_USER();
 
 --echo ## test SET PASSWORD
@@ -42,13 +42,13 @@ disconnect plug_con;
 connect(plug_con,localhost,plug,bad_credentials);
 
 --echo ## test bad default plugin : nothing bad happens, as that plugin was't required by the server
-connect(plug_con_wrongp,localhost,plug,plug_dest,,,,,wrong_plugin_name);
+connect(plug_con_wrongp,localhost,plug,plug_dest,"*NO-ONE*",,,,wrong_plugin_name);
 select USER(),CURRENT_USER();
 connection default;
 disconnect plug_con_wrongp;
 
 --echo ## test correct default plugin
-connect(plug_con_rightp,localhost,plug,plug_dest,,,,,auth_test_plugin);
+connect(plug_con_rightp,localhost,plug,plug_dest,"*NO-ONE*",,,,auth_test_plugin);
 select USER(),CURRENT_USER();
 connection default;
 disconnect plug_con_rightp;
@@ -64,7 +64,7 @@ CREATE USER `Ÿ` IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
 
 GRANT PROXY ON plug_dest TO `Ÿ`;
 
-connect(non_ascii,localhost,Ÿ,plug_dest);
+connect(non_ascii,localhost,Ÿ,plug_dest,"*NO-ONE*");
 select USER(),CURRENT_USER();
 
 connection default;
@@ -80,8 +80,9 @@ GRANT ALL PRIVILEGES ON test_grant_db.* TO new_grant_user
   IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
 
 GRANT PROXY ON plug_dest TO new_grant_user;  
+GRANT CREATE, DROP ON test_grant_db.* TO 'plug_dest'@'%';
 
-connect(plug_con_grant,localhost,new_grant_user,plug_dest);
+connect(plug_con_grant,localhost,new_grant_user,plug_dest,"*NO-ONE*");
 select USER(),CURRENT_USER();
 USE test_grant_db;
 CREATE TABLE t1 (a INT);
@@ -98,9 +99,8 @@ GRANT ALL PRIVILEGES ON test_grant_db.* TO new_grant_user
 --error ER_ACCESS_DENIED_ERROR
 connect(plug_con_grant_deny,localhost,new_grant_user,plug_dest);
 
-connect(plug_con_grant,localhost,new_grant_user,new_password);
+connect(plug_con_grant,localhost,new_grant_user,new_password,test_grant_db);
 select USER(),CURRENT_USER();
-USE test_grant_db;
 CREATE TABLE t1 (a INT);
 DROP TABLE t1;
 connection default;
@@ -155,7 +155,7 @@ GRANT ALL SELECT,PROXY ON grant_plug_dest TO grant_plug;
 --error ER_NONEXISTING_GRANT
 REVOKE PROXY ON grant_plug_dest FROM grant_plug;
 
-connect(grant_plug_dest_con,localhost,grant_plug_dest,grant_plug_dest_passwd);
+connect(grant_plug_dest_con,localhost,grant_plug_dest,grant_plug_dest_passwd,"*NO-ONE*");
 
 --echo ## testing what an ordinary user can grant 
 --echo this should fail : no rights to grant all
@@ -258,7 +258,7 @@ SET GLOBAL proxy_user = 'test';
 SET LOCAL proxy_user = 'test';
 SELECT @@LOCAL.proxy_user;
 
-connect(plug_con,localhost,plug,plug_dest);
+connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*");
 SELECT @@LOCAL.proxy_user;
 connection default;
 disconnect plug_con;
@@ -284,7 +284,7 @@ SET GLOBAL external_user = 'test';
 SET LOCAL external_user = 'test';
 SELECT @@LOCAL.external_user;
 
-connect(plug_con,localhost,plug,plug_dest);
+connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*");
 SELECT @@LOCAL.external_user;
 connection default;
 disconnect plug_con;
@@ -414,7 +414,7 @@ CREATE USER uplain@localhost IDENTIFIED WITH 'cleartext_plugin_server'
 connect(cleartext_fail_con,localhost,uplain,cleartext_test2);
 --enable_query_log
 
-connect(cleartext_con,localhost,uplain,cleartext_test);
+connect(cleartext_con,localhost,uplain,cleartext_test,"*NO-ONE*");
 select USER(),CURRENT_USER();
 
 connection default;
@@ -529,7 +529,7 @@ SET PASSWORD FOR bug12610784@localhost = PASSWORD('secret');
 --error ER_ACCESS_DENIED_ERROR
 connect(b12610784,localhost,bug12610784,,test);
 --enable_query_log
-connect(b12610784,localhost,bug12610784,secret,test);
+connect(b12610784,localhost,bug12610784,secret,"*NO-ONE*");
 connection default;
 disconnect b12610784;
 DROP USER bug12610784@localhost;
@@ -546,7 +546,7 @@ CREATE USER bug12818542_dest@localhost
   IDENTIFIED BY 'bug12818542_dest_passwd';
 GRANT PROXY ON bug12818542_dest@localhost TO bug12818542@localhost;
 
-connect(bug12818542_con,localhost,bug12818542,bug12818542_dest);
+connect(bug12818542_con,localhost,bug12818542,bug12818542_dest,"*NO-ONE*");
 SELECT USER(),CURRENT_USER();
 
 SET PASSWORD = PASSWORD('bruhaha');
@@ -554,7 +554,7 @@ SET PASSWORD = PASSWORD('bruhaha');
 connection default;
 disconnect bug12818542_con;
 
-connect(bug12818542_con2,localhost,bug12818542,bug12818542_dest);
+connect(bug12818542_con2,localhost,bug12818542,bug12818542_dest,"*NO-ONE*");
 SELECT USER(),CURRENT_USER();
 
 connection default;