mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch '10.2' into 10.3

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2018-04-12 12:41:19 +03:00
commit 65eefcdc60
145 changed files with 1963 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
View file

@ -561,8 +561,15 @@ disconnect con4a;
disconnect con4b;
disconnect con4c;
set global max_user_connections = 0;
set global max_connections = 3;
set global max_connections = 10;
flush user_resources;
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
@ -697,6 +704,13 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set
disconnect con5a;
disconnect con5b;
disconnect tmp_con1;
disconnect tmp_con2;
disconnect tmp_con3;
disconnect tmp_con4;
disconnect tmp_con5;
disconnect tmp_con6;
disconnect tmp_con7;
set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
drop user 'quota'@'santa.claus.ipv4.example.com';

16
mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
View file

@ -561,8 +561,15 @@ disconnect con4a;
disconnect con4b;
disconnect con4c;
set global max_user_connections = 0;
set global max_connections = 3;
set global max_connections = 10;
flush user_resources;
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
@ -697,6 +704,13 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set
disconnect con5a;
disconnect con5b;
disconnect tmp_con1;
disconnect tmp_con2;
disconnect tmp_con3;
disconnect tmp_con4;
disconnect tmp_con5;
disconnect tmp_con6;
disconnect tmp_con7;
set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
drop user 'quota'@'santa.claus.ipv6.example.com';