database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-04-10 17:43:18 +03:00
parent f5cb66fb97 2e91eb7547
commit 45e6d0aebf
134 changed files with 1474 additions and 391 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,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 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';