diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result index 757285b1033..5ae11717392 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result @@ -12,8 +12,20 @@ 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.ipv6.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.ipv6.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.ipv6.example.com'; grant select on test.* to 'quota'@'santa.claus.ipv6.example.com'; connect con1,"::1",root,,test,$MASTER_MYPORT,; |