diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result index 3283fa43193..9ec33df2fee 100644 --- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result +++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result @@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv6.example.com' identified by 'good_password'; grant select on test.* to 'user_ssl'@'santa.claus.ipv6.example.com' REQUIRE SSL; -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 select on test.* to 'user_ssl_x509'@'santa.claus.ipv6.example.com' REQUIRE SUBJECT '/C=??/ST=??/L=??/ O=No such thing/ CN=Santa Claus/emailAddress=santa.claus@example.com'; -<<<<<<< HEAD connect con1,"::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 |