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

12
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
View File

@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 3;
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv4.example.com';
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;