Fix perfschema.hostcache_ipv4_max_con

Also fix perfschema.hostcache_ipv6_max_con.
The test case makes use of a debug switch to execute some special code.
The code does hostname replacement. Every hostname sent during connect
phase becomes santa.claus.ipv4.example.com (or ipv6). This causes a
connection from root@localhost to fail, as root is not registered as
santa claus user. The failure is only apparent on Windows as Unix
systems make use of sockets, which bypass the name resolution check
entirely.

4 files changed, 28 insertions, 28 deletions

diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
index 7b852609f58..7a7f0882757 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
@@ -563,13 +563,13 @@ disconnect con4c;
 set global max_user_connections = 0;
 set global max_connections = 10;
 flush user_resources;
-connect  tmp_con1,localhost,root,,;
-connect  tmp_con2,localhost,root,,;
-connect  tmp_con3,localhost,root,,;
-connect  tmp_con4,localhost,root,,;
-connect  tmp_con5,localhost,root,,;
-connect  tmp_con6,localhost,root,,;
-connect  tmp_con7,localhost,root,,;
+connect  tmp_con1,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con2,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con3,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con4,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con5,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con6,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con7,localhost,quota,,test,$MASTER_MYPORT,;
 connect  con5a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
 select "Con4a is alive";
 Con4a is alive
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
index ef807bebc9e..46715d90e2b 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
@@ -563,13 +563,13 @@ disconnect con4c;
 set global max_user_connections = 0;
 set global max_connections = 10;
 flush user_resources;
-connect  tmp_con1,localhost,root,,;
-connect  tmp_con2,localhost,root,,;
-connect  tmp_con3,localhost,root,,;
-connect  tmp_con4,localhost,root,,;
-connect  tmp_con5,localhost,root,,;
-connect  tmp_con6,localhost,root,,;
-connect  tmp_con7,localhost,root,,;
+connect  tmp_con1,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con2,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con3,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con4,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con5,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con6,localhost,quota,,test,$MASTER_MYPORT,;
+connect  tmp_con7,localhost,quota,,test,$MASTER_MYPORT,;
 connect  con5a,"::1",quota,,test,$MASTER_MYPORT,;
 select "Con4a is alive";
 Con4a is alive
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
index a76e04ea35e..7620c41491f 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
@@ -179,13 +179,13 @@ set global max_user_connections = 0;
 set global max_connections = 10;
 flush user_resources;
 
-connect (tmp_con1,localhost,root,,);
-connect (tmp_con2,localhost,root,,);
-connect (tmp_con3,localhost,root,,);
-connect (tmp_con4,localhost,root,,);
-connect (tmp_con5,localhost,root,,);
-connect (tmp_con6,localhost,root,,);
-connect (tmp_con7,localhost,root,,);
+connect (tmp_con1,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con2,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con3,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con4,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con5,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con6,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con7,localhost,quota,,test,$MASTER_MYPORT,);
 
 connect (con5a,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
 select "Con4a is alive";
diff --git a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
index 96a5d10d6e1..be5d2c258ee 100644
--- a/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
+++ b/mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
@@ -180,13 +180,13 @@ set global max_user_connections = 0;
 set global max_connections = 10;
 flush user_resources;
 
-connect (tmp_con1,localhost,root,,);
-connect (tmp_con2,localhost,root,,);
-connect (tmp_con3,localhost,root,,);
-connect (tmp_con4,localhost,root,,);
-connect (tmp_con5,localhost,root,,);
-connect (tmp_con6,localhost,root,,);
-connect (tmp_con7,localhost,root,,);
+connect (tmp_con1,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con2,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con3,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con4,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con5,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con6,localhost,quota,,test,$MASTER_MYPORT,);
+connect (tmp_con7,localhost,quota,,test,$MASTER_MYPORT,);
 
 connect (con5a,"::1",quota,,test,$MASTER_MYPORT,);
 select "Con4a is alive";