summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 03:26:39 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 03:26:39 +0300
commit93aded05eadc08627ff157543f69841cbdb186a3 (patch)
tree73675a7dade75eee86b4d6bffd8403420cbbb022
parent990283b65c6585622b86eade3bf7d9dd9151af40 (diff)
downloadmariadb-git-93aded05eadc08627ff157543f69841cbdb186a3.tar.gz
Use same connection convention of specifying IPs
If we use hostnames, it will fail during name resolution on UNIX systems
-rw-r--r--mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result14
-rw-r--r--mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result14
-rw-r--r--mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test14
-rw-r--r--mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test14
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 7a7f0882757..357aa07f08d 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,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 tmp_con1,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con2,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con3,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con4,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con5,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con6,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con7,"127.0.0.1",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 46715d90e2b..8fe9a0954a3 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,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 tmp_con1,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con2,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con3,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con4,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con5,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con6,"::1",quota,,test,$MASTER_MYPORT,;
+connect tmp_con7,"::1",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 7620c41491f..4eb630f6350 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,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 (tmp_con1,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con2,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con3,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con4,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con5,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con6,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con7,"127.0.0.1",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 be5d2c258ee..8948ea45e37 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,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 (tmp_con1,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con2,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con3,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con4,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con5,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con6,"::1",quota,,test,$MASTER_MYPORT,);
+connect (tmp_con7,"::1",quota,,test,$MASTER_MYPORT,);
connect (con5a,"::1",quota,,test,$MASTER_MYPORT,);
select "Con4a is alive";