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

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
View File

@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_connections_per_hour 3;
<<<<<<< HEAD
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive
@ -205,12 +200,8 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_connections_per_hour 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_user_connections 3;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
connect con3a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
select "Con7 is alive";
@ -385,8 +376,6 @@ disconnect con3b;
disconnect con3c;
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_user_connections 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
set global max_user_connections = 3;
connect con4a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;