diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result index ca340f2c4cb..f899cb935e9 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result @@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%'; User Host select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%'; User Host -<<<<<<< HEAD create user 'root'@'2001:db8::6:6'; grant select on test.* to 'root'@'2001:db8::6:6'; connect con1,"::1",root,,test,$MASTER_MYPORT,; -======= -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. -grant select on test.* to 'root'@'2001:db8::6:6'; -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. ->>>>>>> merge-perfschema-5.7 select "Con1 is alive"; Con1 is alive Con1 is alive |