1 files changed, 60 insertions, 0 deletions

diff --git a/mysql-test/r/user_limits.result b/mysql-test/r/user_limits.result
index 5ab98d1fc30..bbf73d7c617 100644
--- a/mysql-test/r/user_limits.result
+++ b/mysql-test/r/user_limits.result
@@ -9,18 +9,27 @@ flush privileges;
 create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost with max_queries_per_hour 2;
 flush user_resources;
+connect  mqph, localhost, mysqltest_1,,;
+connection mqph;
 select * from t1;
 i
 select * from t1;
 i
 select * from t1;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_queries_per_hour' resource (current value: 2)
+connect  mqph2, localhost, mysqltest_1,,;
+connection mqph2;
 select * from t1;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_queries_per_hour' resource (current value: 2)
+connection default;
 drop user mysqltest_1@localhost;
+disconnect mqph;
+disconnect mqph2;
 create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost with max_updates_per_hour 2;
 flush user_resources;
+connect  muph, localhost, mysqltest_1,,;
+connection muph;
 select * from t1;
 i
 select * from t1;
@@ -33,43 +42,69 @@ delete from t1;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_updates_per_hour' resource (current value: 2)
 select * from t1;
 i
+connect  muph2, localhost, mysqltest_1,,;
+connection muph2;
 delete from t1;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_updates_per_hour' resource (current value: 2)
 select * from t1;
 i
+connection default;
 drop user mysqltest_1@localhost;
+disconnect muph;
+disconnect muph2;
 create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost with max_connections_per_hour 2;
 flush user_resources;
+connect  mcph1, localhost, mysqltest_1,,;
+connection mcph1;
 select * from t1;
 i
+connect  mcph2, localhost, mysqltest_1,,;
+connection mcph2;
 select * from t1;
 i
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  mcph3, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_connections_per_hour' resource (current value: 2)
 select * from t1;
 i
+disconnect mcph1;
+disconnect mcph2;
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  mcph3, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_connections_per_hour' resource (current value: 2)
+connection default;
 drop user mysqltest_1@localhost;
 flush privileges;
 create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost with max_user_connections 2;
 flush user_resources;
+connect  muc1, localhost, mysqltest_1,,;
+connection muc1;
 select * from t1;
 i
+connect  muc2, localhost, mysqltest_1,,;
+connection muc2;
 select * from t1;
 i
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muc3, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource (current value: 2)
+disconnect muc1;
+connect  muc3, localhost, mysqltest_1,,;
 select * from t1;
 i
+connection default;
 grant usage on *.* to mysqltest_1@localhost with max_user_connections 3;
 flush user_resources;
+connect  muc4, localhost, mysqltest_1,,;
+connection muc4;
 select * from t1;
 i
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muc5, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource (current value: 3)
+connection default;
 grant usage on *.* to mysqltest_1@localhost with max_user_connections -1;
 show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
@@ -79,7 +114,11 @@ show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' WITH MAX_USER_CONNECTIONS -1
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muc5, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource (current value: -1)
+disconnect muc2;
+disconnect muc3;
+disconnect muc4;
 drop user mysqltest_1@localhost;
 select @@session.max_user_connections, @@global.max_user_connections;
 @@session.max_user_connections	@@global.max_user_connections
@@ -93,20 +132,33 @@ select @@session.max_user_connections, @@global.max_user_connections;
 create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost;
 flush user_resources;
+connect  muca1, localhost, mysqltest_1,,;
+connection muca1;
 select @@session.max_user_connections, @@global.max_user_connections;
 @@session.max_user_connections	@@global.max_user_connections
 2	2
+connect  muca2, localhost, mysqltest_1,,;
+connection muca2;
 select * from t1;
 i
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muca3, localhost, mysqltest_1,,;
 ERROR 42000: User mysqltest_1 already has more than 'max_user_connections' active connections
+connection default;
 grant usage on *.* to mysqltest_1@localhost with max_user_connections 3;
 flush user_resources;
+connect  muca3, localhost, mysqltest_1,,;
+connection muca3;
 select @@session.max_user_connections, @@global.max_user_connections;
 @@session.max_user_connections	@@global.max_user_connections
 3	2
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muca4, localhost, mysqltest_1,,;
 ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource (current value: 3)
+connection default;
+disconnect muca1;
+disconnect muca2;
+disconnect muca3;
 set global max_user_connections= 0;
 grant usage on *.* to mysqltest_1@localhost with max_user_connections 0;
 set global max_user_connections=-1;
@@ -119,10 +171,18 @@ select @@global.max_user_connections;
 @@global.max_user_connections
 -1
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muca2, localhost, mysqltest_1,,;
 ERROR 42000: User mysqltest_1 already has more than 'max_user_connections' active connections
+connect  muca2, localhost, root,,;
+disconnect muca2;
+connection default;
 set global max_user_connections=1;
+connect  muca2, localhost, mysqltest_1,,;
 connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK);
+connect  muca3, localhost, mysqltest_1,,;
 ERROR 42000: User mysqltest_1 already has more than 'max_user_connections' active connections
+disconnect muca2;
+connection default;
 drop user mysqltest_1@localhost;
 drop table t1;
 set global max_user_connections= @my_max_user_connections;