Skip to content

M
MariaDB
Commit 5f0d489d authored by unknown's avatar unknown
Browse files
Options

MDEV-4058 

  
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table
parent ecbf36a9
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 237 deletions
mysql-test/include/have_ipv6.inc 0 → 100644
View file @ 5f0d489d
# Check if ipv6 is available.
#
--disable_query_log
--disable_result_log
--disable_abort_on_error
connect (checkcon123456789,::1,root,,test);
if($mysql_errno)
{
skip No IPv6 support;
}
connection default;
if(!$mysql_errno)
{
disconnect checkcon123456789;
}
--enable_abort_on_error
--enable_result_log
--enable_query_log
# end check
mysql-test/suite/perfschema/disabled.def
View file @ 5f0d489d
...@@ -9,41 +9,3 @@ ...@@ -9,41 +9,3 @@
# Do not use any TAB characters for whitespace. # Do not use any TAB characters for whitespace.
# #
############################################################################## ##############################################################################
ddl_host_cache:
dml_host_cache:
hostcache_ipv4_addrinfo_again_allow:
hostcache_ipv4_addrinfo_again_deny:
hostcache_ipv4_addrinfo_bad_allow:
hostcache_ipv4_addrinfo_bad_deny:
hostcache_ipv4_addrinfo_good_allow:
hostcache_ipv4_addrinfo_good_deny:
hostcache_ipv4_addrinfo_noname_allow:
hostcache_ipv4_addrinfo_noname_deny:
hostcache_ipv4_auth_plugin:
hostcache_ipv4_blocked:
hostcache_ipv4_format:
hostcache_ipv4_max_con:
hostcache_ipv4_nameinfo_again_allow:
hostcache_ipv4_nameinfo_again_deny:
hostcache_ipv4_nameinfo_noname_allow:
hostcache_ipv4_nameinfo_noname_deny:
hostcache_ipv4_passwd:
hostcache_ipv4_ssl:
hostcache_ipv6_addrinfo_again_allow:
hostcache_ipv6_addrinfo_again_deny:
hostcache_ipv6_addrinfo_bad_allow:
hostcache_ipv6_addrinfo_bad_deny:
hostcache_ipv6_addrinfo_good_allow:
hostcache_ipv6_addrinfo_good_deny:
hostcache_ipv6_addrinfo_noname_allow:
hostcache_ipv6_addrinfo_noname_deny:
hostcache_ipv6_auth_plugin:
hostcache_ipv6_blocked:
hostcache_ipv6_max_con:
hostcache_ipv6_nameinfo_again_allow:
hostcache_ipv6_nameinfo_again_deny:
hostcache_ipv6_nameinfo_noname_allow:
hostcache_ipv6_nameinfo_noname_deny:
hostcache_ipv6_passwd:
hostcache_ipv6_ssl:
hostcache_peer_addr:
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null
LAST_ERROR_SEEN null LAST_ERROR_SEEN null
revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST santa.claus.ipv4.example.com HOST santa.claus.ipv4.example.com
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST santa.claus.ipv4.example.com HOST santa.claus.ipv4.example.com
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
View file @ 5f0d489d
...@@ -12,7 +12,7 @@ Con1 is alive ...@@ -12,7 +12,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; ...@@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
View file @ 5f0d489d
...@@ -14,7 +14,7 @@ Con1 is alive ...@@ -14,7 +14,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
uninstall plugin test_plugin_server; uninstall plugin test_plugin_server;
ERROR HY000: Plugin 'test_plugin_server' is not loaded ERROR HY000: Plugin 'test_plugin_server' is not loaded
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
...@@ -177,4 +177,4 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com' ...@@ -177,4 +177,4 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com'
FROM 'plug'@'santa.claus.ipv4.example.com'; FROM 'plug'@'santa.claus.ipv4.example.com';
DROP USER 'plug'@'santa.claus.ipv4.example.com'; DROP USER 'plug'@'santa.claus.ipv4.example.com';
DROP USER 'plug_dest'@'santa.claus.ipv4.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
View file @ 5f0d489d
...@@ -16,7 +16,7 @@ Con1 is alive ...@@ -16,7 +16,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO) ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv4.example.com' (using password: NO)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
...@@ -195,4 +195,4 @@ LAST_ERROR_SEEN set ...@@ -195,4 +195,4 @@ LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global max_connect_errors = @saved_max_connect_errors; set global max_connect_errors = @saved_max_connect_errors;
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
View file @ 5f0d489d
...@@ -6,7 +6,8 @@ select @@global.debug; ...@@ -6,7 +6,8 @@ select @@global.debug;
select @@global.max_user_connections; select @@global.max_user_connections;
@@global.max_user_connections @@global.max_user_connections
0 1024
select @@global.max_user_connections into @saved_max_user_connections;
select @@global.max_connections; select @@global.max_connections;
@@global.max_connections @@global.max_connections
151 151
...@@ -21,7 +22,7 @@ Con1 is alive ...@@ -21,7 +22,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
select "Con2a is alive"; select "Con2a is alive";
Con2a is alive Con2a is alive
Con2a is alive Con2a is alive
...@@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0 ...@@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global max_connections = @saved_max_connections; set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
drop user 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
View file @ 5f0d489d
...@@ -12,7 +12,7 @@ Con1 is alive ...@@ -12,7 +12,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
select "Con4 is alive"; select "Con4 is alive";
Con4 is alive Con4 is alive
Con4 is alive Con4 is alive
...@@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'192.0.2.4'; ...@@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'192.0.2.4';
revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST santa.claus.ipv4.example.com HOST santa.claus.ipv4.example.com
...@@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST santa.claus.ipv4.example.com HOST santa.claus.ipv4.example.com
...@@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
View file @ 5f0d489d
...@@ -15,7 +15,7 @@ Con1 is alive ...@@ -15,7 +15,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES) ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
...@@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set ...@@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
drop user 'user_with'@'santa.claus.ipv4.example.com'; drop user 'user_with'@'santa.claus.ipv4.example.com';
drop user 'user_without'@'santa.claus.ipv4.example.com'; drop user 'user_without'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
View file @ 5f0d489d
...@@ -19,7 +19,7 @@ Con1 is alive ...@@ -19,7 +19,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO) ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 192.0.2.4 IP 192.0.2.4
...@@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set ...@@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl'@'santa.claus.ipv4.example.com';
drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN null
LAST_ERROR_SEEN null LAST_ERROR_SEEN null
revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
View file @ 5f0d489d
...@@ -9,8 +9,8 @@ Con1 is alive ...@@ -9,8 +9,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST santa.claus.ipv6.example.com HOST santa.claus.ipv6.example.com
...@@ -39,7 +39,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -39,7 +39,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST santa.claus.ipv6.example.com HOST santa.claus.ipv6.example.com
...@@ -68,4 +68,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -68,4 +68,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
View file @ 5f0d489d
...@@ -12,7 +12,7 @@ Con1 is alive ...@@ -12,7 +12,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; ...@@ -85,4 +85,4 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
View file @ 5f0d489d
...@@ -14,7 +14,7 @@ Con1 is alive ...@@ -14,7 +14,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
uninstall plugin test_plugin_server; uninstall plugin test_plugin_server;
ERROR HY000: Plugin 'test_plugin_server' is not loaded ERROR HY000: Plugin 'test_plugin_server' is not loaded
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
...@@ -177,4 +177,4 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' ...@@ -177,4 +177,4 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com'
FROM 'plug'@'santa.claus.ipv6.example.com'; FROM 'plug'@'santa.claus.ipv6.example.com';
DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug'@'santa.claus.ipv6.example.com';
DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
View file @ 5f0d489d
...@@ -6,7 +6,7 @@ select @@global.debug; ...@@ -6,7 +6,7 @@ select @@global.debug;
select @@global.max_connect_errors; select @@global.max_connect_errors;
@@global.max_connect_errors @@global.max_connect_errors
10 100
select @@global.max_connect_errors into @saved_max_connect_errors; select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 2; set global max_connect_errors = 2;
grant select on test.* to 'root'@'santa.claus.ipv6.example.com'; grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
...@@ -16,7 +16,7 @@ Con1 is alive ...@@ -16,7 +16,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO) ERROR 28000: Access denied for user 'quota'@'santa.claus.ipv6.example.com' (using password: NO)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
...@@ -195,4 +195,4 @@ LAST_ERROR_SEEN set ...@@ -195,4 +195,4 @@ LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global max_connect_errors = @saved_max_connect_errors; set global max_connect_errors = @saved_max_connect_errors;
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
View file @ 5f0d489d
...@@ -6,7 +6,8 @@ select @@global.debug; ...@@ -6,7 +6,8 @@ select @@global.debug;
select @@global.max_user_connections; select @@global.max_user_connections;
@@global.max_user_connections @@global.max_user_connections
0 1024
select @@global.max_user_connections into @saved_max_user_connections;
select @@global.max_connections; select @@global.max_connections;
@@global.max_connections @@global.max_connections
151 151
...@@ -21,7 +22,7 @@ Con1 is alive ...@@ -21,7 +22,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
select "Con2a is alive"; select "Con2a is alive";
Con2a is alive Con2a is alive
Con2a is alive Con2a is alive
...@@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0 ...@@ -641,5 +642,6 @@ COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global max_connections = @saved_max_connections; set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
drop user 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
View file @ 5f0d489d
...@@ -12,7 +12,7 @@ Con1 is alive ...@@ -12,7 +12,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -81,7 +81,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
select "Con4 is alive"; select "Con4 is alive";
Con4 is alive Con4 is alive
Con4 is alive Con4 is alive
...@@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; ...@@ -154,4 +154,4 @@ revoke select on test.* from 'root'@'2001:db8::6:6';
revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,8 +69,8 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST santa.claus.ipv6.example.com HOST santa.claus.ipv6.example.com
...@@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -99,7 +99,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MySQL server ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST santa.claus.ipv6.example.com HOST santa.claus.ipv6.example.com
...@@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -128,4 +128,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
View file @ 5f0d489d
...@@ -11,7 +11,7 @@ Con1 is alive ...@@ -11,7 +11,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
select "Con2 is alive"; select "Con2 is alive";
Con2 is alive Con2 is alive
Con2 is alive Con2 is alive
...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set ...@@ -82,4 +82,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
View file @ 5f0d489d
...@@ -10,8 +10,8 @@ Con1 is alive ...@@ -10,8 +10,8 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0 ...@@ -40,7 +40,7 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MySQL server ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
HOST NULL HOST NULL
...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0 ...@@ -69,4 +69,4 @@ COUNT_LOCAL_ERRORS 0
COUNT_UNKNOWN_ERRORS 0 COUNT_UNKNOWN_ERRORS 0
FIRST_ERROR_SEEN set FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
View file @ 5f0d489d
...@@ -15,7 +15,7 @@ Con1 is alive ...@@ -15,7 +15,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES) ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
...@@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set ...@@ -192,4 +192,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_with'@'santa.claus.ipv6.example.com';
drop user 'user_without'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
View file @ 5f0d489d
...@@ -19,7 +19,7 @@ Con1 is alive ...@@ -19,7 +19,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO) ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
IP 2001:db8::6:6 IP 2001:db8::6:6
...@@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set ...@@ -138,4 +138,4 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set LAST_ERROR_SEEN set
drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl'@'santa.claus.ipv6.example.com';
drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/r/hostcache_peer_addr.result
View file @ 5f0d489d
...@@ -17,7 +17,7 @@ Con1 is alive ...@@ -17,7 +17,7 @@ Con1 is alive
select current_user(); select current_user();
current_user() current_user()
root@localhost root@localhost
set global debug= "+d,vio_peer_addr_error"; set global debug_dbug= "+d,vio_peer_addr_error";
ERROR HY000: Can't get hostname for your address ERROR HY000: Can't get hostname for your address
show global status like "connection_errors_%"; show global status like "connection_errors_%";
Variable_name Value Variable_name Value
...@@ -38,7 +38,7 @@ Connection_errors_peer_address 2 ...@@ -38,7 +38,7 @@ Connection_errors_peer_address 2
Connection_errors_select 0 Connection_errors_select 0
Connection_errors_tcpwrap 0 Connection_errors_tcpwrap 0
"Dumping performance_schema.host_cache" "Dumping performance_schema.host_cache"
set global debug= default; set global debug_dbug= default;
flush status; flush status;
show global status like "connection_errors_%"; show global status like "connection_errors_%";
Variable_name Value Variable_name Value
......
mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
View file @ 5f0d489d
...@@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist ...@@ -59,7 +59,7 @@ ERROR 42S02: Table 'mysqltest.does_not_exist' doesn't exist
# The statement has the same length like in 3.2 but the error # The statement has the same length like in 3.2 but the error
# message is now different and much longer. # message is now different and much longer.
SELECT col2 FROM does_not_exist WHERE col1 A 0; SELECT col2 FROM does_not_exist WHERE col1 A 0;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A 0' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'A 0' at line 1
# 3.4 SELECT ending with server sending an error message. # 3.4 SELECT ending with server sending an error message.
# Statement and error message are a bit longer than in 3.1 # Statement and error message are a bit longer than in 3.1
# because the table name is longer. # because the table name is longer.
......
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_allow.test
View file @ 5f0d489d
...@@ -26,7 +26,7 @@ select current_user(); ...@@ -26,7 +26,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -47,5 +47,5 @@ disconnect con3; ...@@ -47,5 +47,5 @@ disconnect con3;
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_again_deny.test
View file @ 5f0d489d
...@@ -24,7 +24,7 @@ select current_user(); ...@@ -24,7 +24,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_allow.test
View file @ 5f0d489d
...@@ -28,7 +28,7 @@ select current_user(); ...@@ -28,7 +28,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -49,5 +49,5 @@ disconnect con3; ...@@ -49,5 +49,5 @@ disconnect con3;
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_bad_deny.test
View file @ 5f0d489d
...@@ -26,7 +26,7 @@ select current_user(); ...@@ -26,7 +26,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -44,5 +44,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -44,5 +44,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_allow.test
View file @ 5f0d489d
...@@ -26,7 +26,7 @@ select current_user(); ...@@ -26,7 +26,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -47,5 +47,5 @@ disconnect con3; ...@@ -47,5 +47,5 @@ disconnect con3;
revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_good_deny.test
View file @ 5f0d489d
...@@ -24,7 +24,7 @@ select current_user(); ...@@ -24,7 +24,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_allow.test
View file @ 5f0d489d
...@@ -27,7 +27,7 @@ select current_user(); ...@@ -27,7 +27,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -50,5 +50,5 @@ revoke select on test.* from 'root'@'192.0.2.4'; ...@@ -50,5 +50,5 @@ revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_addrinfo_noname_deny.test
View file @ 5f0d489d
...@@ -24,7 +24,7 @@ select current_user(); ...@@ -24,7 +24,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_auth_plugin.test
View file @ 5f0d489d
...@@ -29,7 +29,7 @@ select current_user(); ...@@ -29,7 +29,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
uninstall plugin test_plugin_server; uninstall plugin test_plugin_server;
--disable_query_log --disable_query_log
...@@ -48,8 +48,8 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin) ...@@ -48,8 +48,8 @@ connect (con3,"127.0.0.1",plug,plug_dest,test,$MASTER_MYPORT,,,auth_test_plugin)
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
--replace_result $PLUGIN_AUTH PLUGIN_AUTH replace_result $AUTH_TEST_PLUGIN_SO PLUGIN_AUTH
eval install plugin test_plugin_server soname '$PLUGIN_AUTH'; eval install plugin test_plugin_server soname '$AUTH_TEST_PLUGIN_SO';
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -85,5 +85,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com' ...@@ -85,5 +85,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv4.example.com'
DROP USER 'plug'@'santa.claus.ipv4.example.com'; DROP USER 'plug'@'santa.claus.ipv4.example.com';
DROP USER 'plug_dest'@'santa.claus.ipv4.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test
View file @ 5f0d489d
...@@ -29,7 +29,7 @@ select current_user(); ...@@ -29,7 +29,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -86,5 +86,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; ...@@ -86,5 +86,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global max_connect_errors = @saved_max_connect_errors; set global max_connect_errors = @saved_max_connect_errors;
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_format.test
View file @ 5f0d489d
...@@ -23,7 +23,7 @@ select current_user(); ...@@ -23,7 +23,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -41,5 +41,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -41,5 +41,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_max_con.test
View file @ 5f0d489d
...@@ -20,6 +20,7 @@ flush hosts; ...@@ -20,6 +20,7 @@ flush hosts;
flush user_resources; flush user_resources;
select @@global.debug; select @@global.debug;
select @@global.max_user_connections; select @@global.max_user_connections;
select @@global.max_user_connections into @saved_max_user_connections;
select @@global.max_connections; select @@global.max_connections;
select @@global.max_connections into @saved_max_connections; select @@global.max_connections into @saved_max_connections;
...@@ -34,7 +35,7 @@ select current_user(); ...@@ -34,7 +35,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
connect (con2a,"127.0.0.1",quota,,test,$MASTER_MYPORT,); connect (con2a,"127.0.0.1",quota,,test,$MASTER_MYPORT,);
select "Con2a is alive"; select "Con2a is alive";
...@@ -242,9 +243,10 @@ disconnect con5b; ...@@ -242,9 +243,10 @@ disconnect con5b;
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
set global max_connections = @saved_max_connections; set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
# revoke all privileges on test.* from 'quota'@'santa.claus.ipv4.example.com'; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv4.example.com';
drop user 'quota'@'santa.claus.ipv4.example.com'; drop user 'quota'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_allow.test
View file @ 5f0d489d
...@@ -27,7 +27,7 @@ select current_user(); ...@@ -27,7 +27,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -45,7 +45,7 @@ disconnect con3; ...@@ -45,7 +45,7 @@ disconnect con3;
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
connect (con4,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con4,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con4 is alive"; select "Con4 is alive";
...@@ -68,5 +68,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com'; ...@@ -68,5 +68,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
drop user 'root'@'santa.claus.ipv4.example.com'; drop user 'root'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_again_deny.test
View file @ 5f0d489d
...@@ -24,7 +24,7 @@ select current_user(); ...@@ -24,7 +24,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -42,7 +42,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -42,7 +42,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -60,5 +60,5 @@ connect (con5,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -60,5 +60,5 @@ connect (con5,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_allow.test
View file @ 5f0d489d
...@@ -26,7 +26,7 @@ select current_user(); ...@@ -26,7 +26,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,); connect (con2,"127.0.0.1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -47,5 +47,5 @@ disconnect con3; ...@@ -47,5 +47,5 @@ disconnect con3;
revoke select on test.* from 'root'@'192.0.2.4'; revoke select on test.* from 'root'@'192.0.2.4';
drop user 'root'@'192.0.2.4'; drop user 'root'@'192.0.2.4';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_nameinfo_noname_deny.test
View file @ 5f0d489d
...@@ -24,7 +24,7 @@ select current_user(); ...@@ -24,7 +24,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -42,5 +42,5 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_passwd.test
View file @ 5f0d489d
...@@ -29,7 +29,7 @@ select current_user(); ...@@ -29,7 +29,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -82,5 +82,5 @@ connect (con2f,"127.0.0.1",user_with,wrong_password,test,$MASTER_MYPORT,); ...@@ -82,5 +82,5 @@ connect (con2f,"127.0.0.1",user_with,wrong_password,test,$MASTER_MYPORT,);
drop user 'user_with'@'santa.claus.ipv4.example.com'; drop user 'user_with'@'santa.claus.ipv4.example.com';
drop user 'user_without'@'santa.claus.ipv4.example.com'; drop user 'user_without'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv4_ssl.test
View file @ 5f0d489d
...@@ -33,7 +33,7 @@ select current_user(); ...@@ -33,7 +33,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -70,5 +70,5 @@ connect (con2d,"127.0.0.1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL) ...@@ -70,5 +70,5 @@ connect (con2d,"127.0.0.1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL)
drop user 'user_ssl'@'santa.claus.ipv4.example.com'; drop user 'user_ssl'@'santa.claus.ipv4.example.com';
drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv4.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_allow.test
View file @ 5f0d489d
...@@ -27,7 +27,7 @@ select current_user(); ...@@ -27,7 +27,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -48,5 +48,5 @@ disconnect con3; ...@@ -48,5 +48,5 @@ disconnect con3;
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_again_deny.test
View file @ 5f0d489d
...@@ -25,7 +25,7 @@ select current_user(); ...@@ -25,7 +25,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_allow.test
View file @ 5f0d489d
...@@ -29,7 +29,7 @@ select current_user(); ...@@ -29,7 +29,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -50,5 +50,5 @@ disconnect con3; ...@@ -50,5 +50,5 @@ disconnect con3;
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
View file @ 5f0d489d
...@@ -28,7 +28,7 @@ select current_user(); ...@@ -28,7 +28,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -46,5 +46,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -46,5 +46,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
View file @ 5f0d489d
...@@ -27,7 +27,7 @@ select current_user(); ...@@ -27,7 +27,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -48,5 +48,5 @@ disconnect con3; ...@@ -48,5 +48,5 @@ disconnect con3;
revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
View file @ 5f0d489d
...@@ -21,7 +21,7 @@ select current_user(); ...@@ -21,7 +21,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -39,5 +39,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -39,5 +39,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
View file @ 5f0d489d
...@@ -28,7 +28,7 @@ select current_user(); ...@@ -28,7 +28,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -51,5 +51,5 @@ revoke select on test.* from 'root'@'2001:db8::6:6'; ...@@ -51,5 +51,5 @@ revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_deny.test
View file @ 5f0d489d
...@@ -25,7 +25,7 @@ select current_user(); ...@@ -25,7 +25,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_auth_plugin.test
View file @ 5f0d489d
...@@ -30,7 +30,7 @@ select current_user(); ...@@ -30,7 +30,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
uninstall plugin test_plugin_server; uninstall plugin test_plugin_server;
--disable_query_log --disable_query_log
...@@ -87,5 +87,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com' ...@@ -87,5 +87,5 @@ REVOKE PROXY ON 'plug_dest'@'santa.claus.ipv6.example.com'
DROP USER 'plug'@'santa.claus.ipv6.example.com'; DROP USER 'plug'@'santa.claus.ipv6.example.com';
DROP USER 'plug_dest'@'santa.claus.ipv6.example.com'; DROP USER 'plug_dest'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test
View file @ 5f0d489d
...@@ -30,7 +30,7 @@ select current_user(); ...@@ -30,7 +30,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -87,5 +87,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; ...@@ -87,5 +87,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global max_connect_errors = @saved_max_connect_errors; set global max_connect_errors = @saved_max_connect_errors;
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con-master.opt
View file @ 5f0d489d
--bind-addr=:: --bind-addr=::
--max-user-connections=1024
mysql-test/suite/perfschema/t/hostcache_ipv6_max_con.test
View file @ 5f0d489d
...@@ -21,6 +21,7 @@ flush hosts; ...@@ -21,6 +21,7 @@ flush hosts;
flush user_resources; flush user_resources;
select @@global.debug; select @@global.debug;
select @@global.max_user_connections; select @@global.max_user_connections;
select @@global.max_user_connections into @saved_max_user_connections;
select @@global.max_connections; select @@global.max_connections;
select @@global.max_connections into @saved_max_connections; select @@global.max_connections into @saved_max_connections;
...@@ -35,7 +36,7 @@ select current_user(); ...@@ -35,7 +36,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
connect (con2a,"::1",quota,,test,$MASTER_MYPORT,); connect (con2a,"::1",quota,,test,$MASTER_MYPORT,);
select "Con2a is alive"; select "Con2a is alive";
...@@ -224,9 +225,10 @@ disconnect con5b; ...@@ -224,9 +225,10 @@ disconnect con5b;
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
set global max_connections = @saved_max_connections; set global max_connections = @saved_max_connections;
set global max_user_connections = @saved_max_user_connections;
# revoke all privileges on test.* from 'quota'@'santa.claus.ipv6.example.com'; # revoke all privileges on test.* from 'quota'@'santa.claus.ipv6.example.com';
drop user 'quota'@'santa.claus.ipv6.example.com'; drop user 'quota'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_allow.test
View file @ 5f0d489d
...@@ -28,7 +28,7 @@ select current_user(); ...@@ -28,7 +28,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -46,7 +46,7 @@ disconnect con3; ...@@ -46,7 +46,7 @@ disconnect con3;
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
connect (con4,"::1",root,,test,$MASTER_MYPORT,); connect (con4,"::1",root,,test,$MASTER_MYPORT,);
select "Con4 is alive"; select "Con4 is alive";
...@@ -69,5 +69,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com'; ...@@ -69,5 +69,5 @@ revoke select on test.* from 'root'@'santa.claus.ipv6.example.com';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
drop user 'root'@'santa.claus.ipv6.example.com'; drop user 'root'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_again_deny.test
View file @ 5f0d489d
...@@ -25,7 +25,7 @@ select current_user(); ...@@ -25,7 +25,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -43,7 +43,7 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -43,7 +43,7 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -61,5 +61,5 @@ connect (con5,"::1",root,,test,$MASTER_MYPORT,); ...@@ -61,5 +61,5 @@ connect (con5,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_allow.test
View file @ 5f0d489d
...@@ -27,7 +27,7 @@ select current_user(); ...@@ -27,7 +27,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
connect (con2,"::1",root,,test,$MASTER_MYPORT,); connect (con2,"::1",root,,test,$MASTER_MYPORT,);
select "Con2 is alive"; select "Con2 is alive";
...@@ -48,5 +48,5 @@ disconnect con3; ...@@ -48,5 +48,5 @@ disconnect con3;
revoke select on test.* from 'root'@'2001:db8::6:6'; revoke select on test.* from 'root'@'2001:db8::6:6';
drop user 'root'@'2001:db8::6:6'; drop user 'root'@'2001:db8::6:6';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_nameinfo_noname_deny.test
View file @ 5f0d489d
...@@ -25,7 +25,7 @@ select current_user(); ...@@ -25,7 +25,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
--disable_query_log --disable_query_log
--error ER_HOST_NOT_PRIVILEGED --error ER_HOST_NOT_PRIVILEGED
...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,); ...@@ -43,5 +43,5 @@ connect (con3,"::1",root,,test,$MASTER_MYPORT,);
--connection default --connection default
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_passwd.test
View file @ 5f0d489d
...@@ -30,7 +30,7 @@ select current_user(); ...@@ -30,7 +30,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -83,5 +83,5 @@ connect (con2f,"::1",user_with,wrong_password,test,$MASTER_MYPORT,); ...@@ -83,5 +83,5 @@ connect (con2f,"::1",user_with,wrong_password,test,$MASTER_MYPORT,);
drop user 'user_with'@'santa.claus.ipv6.example.com'; drop user 'user_with'@'santa.claus.ipv6.example.com';
drop user 'user_without'@'santa.claus.ipv6.example.com'; drop user 'user_without'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_ipv6_ssl.test
View file @ 5f0d489d
...@@ -34,7 +34,7 @@ select current_user(); ...@@ -34,7 +34,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6"; set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
--disable_query_log --disable_query_log
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
...@@ -71,5 +71,5 @@ connect (con2d,"::1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL); ...@@ -71,5 +71,5 @@ connect (con2d,"::1",user_ssl_x509,good_password,test,$MASTER_MYPORT,,SSL);
drop user 'user_ssl'@'santa.claus.ipv6.example.com'; drop user 'user_ssl'@'santa.claus.ipv6.example.com';
drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com'; drop user 'user_ssl_x509'@'santa.claus.ipv6.example.com';
set global debug= default; set global debug_dbug= default;
mysql-test/suite/perfschema/t/hostcache_peer_addr.test
View file @ 5f0d489d
...@@ -20,7 +20,7 @@ select current_user(); ...@@ -20,7 +20,7 @@ select current_user();
disconnect con1; disconnect con1;
--connection default --connection default
set global debug= "+d,vio_peer_addr_error"; set global debug_dbug= "+d,vio_peer_addr_error";
--disable_query_log --disable_query_log
--error ER_BAD_HOST_ERROR --error ER_BAD_HOST_ERROR
...@@ -40,7 +40,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,); ...@@ -40,7 +40,7 @@ connect (con3,"127.0.0.1",root,,test,$MASTER_MYPORT,);
show global status like "connection_errors_%"; show global status like "connection_errors_%";
--source ../include/hostcache_dump.inc --source ../include/hostcache_dump.inc
set global debug= default; set global debug_dbug= default;
flush status; flush status;
show global status like "connection_errors_%"; show global status like "connection_errors_%";
......
mysql-test/suite/perfschema/t/socket_connect.test
View file @ 5f0d489d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug=0; let $my_socket_debug_dbug=0;
--echo #============================================================================== --echo #==============================================================================
--echo # Establish the level of IPV6 support --echo # Establish the level of IPV6 support
......
mysql-test/suite/perfschema/t/socket_instances_func.test
View file @ 5f0d489d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
# #
# Set IP address defaults with respect to IPV6 support # Set IP address defaults with respect to IPV6 support
......
mysql-test/suite/perfschema/t/socket_instances_func_win.test
View file @ 5f0d489d
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/have_perfschema.inc --source include/have_perfschema.inc
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
# #
# Set IP address defaults with respect to IPV6 support # Set IP address defaults with respect to IPV6 support
......
mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
View file @ 5f0d489d
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
--source ../include/no_protocol.inc --source ../include/no_protocol.inc
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
--echo #============================================================================== --echo #==============================================================================
--echo # Establish the level of IPV6 support --echo # Establish the level of IPV6 support
......
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View file @ 5f0d489d
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
# Set IP address defaults with respect to IPV6 support # Set IP address defaults with respect to IPV6 support
# #
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
# #
# Determine if IPV6 supported # Determine if IPV6 supported
# #
...@@ -66,7 +66,7 @@ if($check_ipv4_mapped_supported) ...@@ -66,7 +66,7 @@ if($check_ipv4_mapped_supported)
let $my_localhost=::ffff:127.0.0.1; let $my_localhost=::ffff:127.0.0.1;
} }
# #
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
if($my_socket_debug) if($my_socket_debug)
{ {
--echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost
......
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
View file @ 5f0d489d
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
# Set IP address defaults with respect to IPV6 support # Set IP address defaults with respect to IPV6 support
# #
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
# #
# Determine if IPV6 supported # Determine if IPV6 supported
# #
...@@ -68,7 +68,7 @@ if($check_ipv4_mapped_supported) ...@@ -68,7 +68,7 @@ if($check_ipv4_mapped_supported)
let $my_localhost=::ffff:127.0.0.1; let $my_localhost=::ffff:127.0.0.1;
} }
# #
let $my_socket_debug= 0; let $my_socket_debug_dbug= 0;
if($my_socket_debug) if($my_socket_debug)
{ {
--echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost --echo IPV6=$check_ipv6_supported, IPV4_MAPPED = $check_ipv4_mapped_supported, LOCALHOST = $my_localhost
......
sql/hostname.cc
View file @ 5f0d489d
...@@ -282,7 +282,7 @@ static void add_hostname(const char *ip_key, const char *hostname, ...@@ -282,7 +282,7 @@ static void add_hostname(const char *ip_key, const char *hostname,
if (specialflag & SPECIAL_NO_HOST_CACHE) if (specialflag & SPECIAL_NO_HOST_CACHE)
return; return;
ulonglong now= my_time(); ulonglong now= my_hrtime().val;
mysql_mutex_lock(&hostname_cache->lock); mysql_mutex_lock(&hostname_cache->lock);
...@@ -298,7 +298,7 @@ void inc_host_errors(const char *ip_string, Host_errors *errors) ...@@ -298,7 +298,7 @@ void inc_host_errors(const char *ip_string, Host_errors *errors)
if (!ip_string) if (!ip_string)
return; return;
ulonglong now= my_time(); ulonglong now= my_hrtime().val;
char ip_key[HOST_ENTRY_KEY_SIZE]; char ip_key[HOST_ENTRY_KEY_SIZE];
prepare_hostname_cache_key(ip_string, ip_key); prepare_hostname_cache_key(ip_string, ip_key);
...@@ -448,7 +448,7 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage, ...@@ -448,7 +448,7 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
if (!(specialflag & SPECIAL_NO_HOST_CACHE)) if (!(specialflag & SPECIAL_NO_HOST_CACHE))
{ {
ulonglong now= my_time(); ulonglong now= my_hrtime().val;
mysql_mutex_lock(&hostname_cache->lock); mysql_mutex_lock(&hostname_cache->lock);
......
sql/sql_acl.cc
View file @ 5f0d489d
...@@ -9071,6 +9071,9 @@ bool acl_authenticate(THD *thd, uint connect_errors, ...@@ -9071,6 +9071,9 @@ bool acl_authenticate(THD *thd, uint connect_errors,
/* we need to find the proxy user, but there was none */ /* we need to find the proxy user, but there was none */
if (!proxy_user) if (!proxy_user)
{ {
Host_errors errors;
errors.m_proxy_user= 1;
inc_host_errors(mpvio.thd->security_ctx->ip, &errors);
if (!thd->is_error()) if (!thd->is_error())
login_failed_error(thd); login_failed_error(thd);
DBUG_RETURN(1); DBUG_RETURN(1);
...@@ -9087,6 +9090,9 @@ bool acl_authenticate(THD *thd, uint connect_errors, ...@@ -9087,6 +9090,9 @@ bool acl_authenticate(THD *thd, uint connect_errors,
mpvio.auth_info.authenticated_as, TRUE); mpvio.auth_info.authenticated_as, TRUE);
if (!acl_proxy_user) if (!acl_proxy_user)
{ {
Host_errors errors;
errors.m_proxy_user_acl= 1;
inc_host_errors(mpvio.thd->security_ctx->ip, &errors);
if (!thd->is_error()) if (!thd->is_error())
login_failed_error(thd); login_failed_error(thd);
mysql_mutex_unlock(&acl_cache->lock); mysql_mutex_unlock(&acl_cache->lock);
...@@ -9115,6 +9121,9 @@ bool acl_authenticate(THD *thd, uint connect_errors, ...@@ -9115,6 +9121,9 @@ bool acl_authenticate(THD *thd, uint connect_errors,
*/ */
if (acl_check_ssl(thd, acl_user)) if (acl_check_ssl(thd, acl_user))
{ {
Host_errors errors;
errors.m_ssl= 1;
inc_host_errors(mpvio.thd->security_ctx->ip, &errors);
login_failed_error(thd); login_failed_error(thd);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7