Skip to content

Commit a765af4

Browse files
marcalffmarcalff
committed
Work in progress
1 parent 22a797f commit a765af4

24 files changed

Lines changed: 245 additions & 161 deletions

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ select * from performance_schema.host_cache;
2323
IP 192.0.2.4
2424
HOST NULL
2525
HOST_VALIDATED NO
26-
SUM_BLOCKING_ERRORS 1
26+
SUM_BLOCKING_ERRORS 0
2727
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2828
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2929
COUNT_FORMAT_ERRORS 0
@@ -44,7 +44,7 @@ select * from performance_schema.host_cache;
4444
IP 192.0.2.4
4545
HOST NULL
4646
HOST_VALIDATED NO
47-
SUM_BLOCKING_ERRORS 2
47+
SUM_BLOCKING_ERRORS 0
4848
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4949
COUNT_NAMEINFO_PERMANENT_ERRORS 0
5050
COUNT_FORMAT_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ select * from performance_schema.host_cache;
2222
IP 192.0.2.4
2323
HOST NULL
2424
HOST_VALIDATED NO
25-
SUM_BLOCKING_ERRORS 1
25+
SUM_BLOCKING_ERRORS 0
2626
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2727
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2828
COUNT_FORMAT_ERRORS 0
@@ -43,7 +43,7 @@ select * from performance_schema.host_cache;
4343
IP 192.0.2.4
4444
HOST NULL
4545
HOST_VALIDATED NO
46-
SUM_BLOCKING_ERRORS 2
46+
SUM_BLOCKING_ERRORS 0
4747
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4848
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4949
COUNT_FORMAT_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Peer_address_errors 0
2727
select * from performance_schema.host_cache;
2828
IP 192.0.2.4
2929
HOST NULL
30-
HOST_VALIDATED NO
30+
HOST_VALIDATED YES
3131
SUM_BLOCKING_ERRORS 0
3232
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
3333
COUNT_NAMEINFO_PERMANENT_ERRORS 0
@@ -53,14 +53,14 @@ Peer_address_errors 0
5353
select * from performance_schema.host_cache;
5454
IP 192.0.2.4
5555
HOST NULL
56-
HOST_VALIDATED NO
56+
HOST_VALIDATED YES
5757
SUM_BLOCKING_ERRORS 0
5858
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
5959
COUNT_NAMEINFO_PERMANENT_ERRORS 0
6060
COUNT_FORMAT_ERRORS 0
6161
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
6262
COUNT_ADDRINFO_PERMANENT_ERRORS 0
63-
COUNT_FCRDNS_ERRORS 2
63+
COUNT_FCRDNS_ERRORS 1
6464
COUNT_HOST_ACL_ERRORS 0
6565
COUNT_HANDSHAKE_ERRORS 0
6666
COUNT_AUTHENTICATION_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Peer_address_errors 0
2121
select * from performance_schema.host_cache;
2222
IP 192.0.2.4
2323
HOST NULL
24-
HOST_VALIDATED NO
25-
SUM_BLOCKING_ERRORS 1
24+
HOST_VALIDATED YES
25+
SUM_BLOCKING_ERRORS 0
2626
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2727
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2828
COUNT_FORMAT_ERRORS 0
@@ -42,14 +42,14 @@ Peer_address_errors 0
4242
select * from performance_schema.host_cache;
4343
IP 192.0.2.4
4444
HOST NULL
45-
HOST_VALIDATED NO
46-
SUM_BLOCKING_ERRORS 2
45+
HOST_VALIDATED YES
46+
SUM_BLOCKING_ERRORS 0
4747
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4848
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4949
COUNT_FORMAT_ERRORS 0
5050
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
5151
COUNT_ADDRINFO_PERMANENT_ERRORS 0
52-
COUNT_FCRDNS_ERRORS 2
52+
COUNT_FCRDNS_ERRORS 1
5353
COUNT_HOST_ACL_ERRORS 2
5454
COUNT_HANDSHAKE_ERRORS 0
5555
COUNT_AUTHENTICATION_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ select * from performance_schema.host_cache;
2222
IP 192.0.2.4
2323
HOST santa.claus.ipv4.example.com
2424
HOST_VALIDATED YES
25-
SUM_BLOCKING_ERRORS 1
25+
SUM_BLOCKING_ERRORS 0
2626
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2727
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2828
COUNT_FORMAT_ERRORS 0
@@ -43,7 +43,7 @@ select * from performance_schema.host_cache;
4343
IP 192.0.2.4
4444
HOST santa.claus.ipv4.example.com
4545
HOST_VALIDATED YES
46-
SUM_BLOCKING_ERRORS 2
46+
SUM_BLOCKING_ERRORS 0
4747
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4848
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4949
COUNT_FORMAT_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
call mtr.add_suppression("192.0.2.4");
1+
call mtr.add_suppression("santa.claus.ipv4.example.com");
22
flush status;
33
flush hosts;
44
select @@global.debug;

‎mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
call mtr.add_suppression("192.0.2.4");
1+
call mtr.add_suppression("santa.claus.ipv4.example.com");
22
flush status;
33
flush hosts;
44
select @@global.debug;
@@ -22,7 +22,7 @@ select * from performance_schema.host_cache;
2222
IP 192.0.2.4
2323
HOST NULL
2424
HOST_VALIDATED YES
25-
SUM_BLOCKING_ERRORS 1
25+
SUM_BLOCKING_ERRORS 0
2626
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2727
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2828
COUNT_FORMAT_ERRORS 0
@@ -43,7 +43,7 @@ select * from performance_schema.host_cache;
4343
IP 192.0.2.4
4444
HOST NULL
4545
HOST_VALIDATED YES
46-
SUM_BLOCKING_ERRORS 2
46+
SUM_BLOCKING_ERRORS 0
4747
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4848
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4949
COUNT_FORMAT_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_format.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ select * from performance_schema.host_cache;
2222
IP 192.0.2.4
2323
HOST NULL
2424
HOST_VALIDATED NO
25-
SUM_BLOCKING_ERRORS 1
25+
SUM_BLOCKING_ERRORS 0
2626
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
2727
COUNT_NAMEINFO_PERMANENT_ERRORS 0
2828
COUNT_FORMAT_ERRORS 1
@@ -43,7 +43,7 @@ select * from performance_schema.host_cache;
4343
IP 192.0.2.4
4444
HOST NULL
4545
HOST_VALIDATED NO
46-
SUM_BLOCKING_ERRORS 2
46+
SUM_BLOCKING_ERRORS 0
4747
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4848
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4949
COUNT_FORMAT_ERRORS 2

‎mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@ show global status like "%peer%";
2626
Variable_name Value
2727
Peer_address_errors 0
2828
select * from performance_schema.host_cache;
29+
IP 192.0.2.4
30+
HOST NULL
31+
HOST_VALIDATED NO
32+
SUM_BLOCKING_ERRORS 0
33+
COUNT_NAMEINFO_TRANSIENT_ERRORS 1
34+
COUNT_NAMEINFO_PERMANENT_ERRORS 0
35+
COUNT_FORMAT_ERRORS 0
36+
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
37+
COUNT_ADDRINFO_PERMANENT_ERRORS 0
38+
COUNT_FCRDNS_ERRORS 0
39+
COUNT_HOST_ACL_ERRORS 0
40+
COUNT_HANDSHAKE_ERRORS 0
41+
COUNT_AUTHENTICATION_ERRORS 0
42+
COUNT_USER_ACL_ERRORS 0
43+
COUNT_LOCAL_ERRORS 0
44+
COUNT_UNKNOWN_ERRORS 0
2945
select "Con3 is alive";
3046
Con3 is alive
3147
Con3 is alive
@@ -36,6 +52,22 @@ show global status like "%peer%";
3652
Variable_name Value
3753
Peer_address_errors 0
3854
select * from performance_schema.host_cache;
55+
IP 192.0.2.4
56+
HOST NULL
57+
HOST_VALIDATED NO
58+
SUM_BLOCKING_ERRORS 0
59+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
60+
COUNT_NAMEINFO_PERMANENT_ERRORS 0
61+
COUNT_FORMAT_ERRORS 0
62+
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
63+
COUNT_ADDRINFO_PERMANENT_ERRORS 0
64+
COUNT_FCRDNS_ERRORS 0
65+
COUNT_HOST_ACL_ERRORS 0
66+
COUNT_HANDSHAKE_ERRORS 0
67+
COUNT_AUTHENTICATION_ERRORS 0
68+
COUNT_USER_ACL_ERRORS 0
69+
COUNT_LOCAL_ERRORS 0
70+
COUNT_UNKNOWN_ERRORS 0
3971
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
4072
select "Con4 is alive";
4173
Con4 is alive
@@ -51,7 +83,7 @@ IP 192.0.2.4
5183
HOST santa.claus.ipv4.example.com
5284
HOST_VALIDATED YES
5385
SUM_BLOCKING_ERRORS 0
54-
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
86+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
5587
COUNT_NAMEINFO_PERMANENT_ERRORS 0
5688
COUNT_FORMAT_ERRORS 0
5789
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
@@ -77,7 +109,7 @@ IP 192.0.2.4
77109
HOST santa.claus.ipv4.example.com
78110
HOST_VALIDATED YES
79111
SUM_BLOCKING_ERRORS 0
80-
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
112+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
81113
COUNT_NAMEINFO_PERMANENT_ERRORS 0
82114
COUNT_FORMAT_ERRORS 0
83115
COUNT_ADDRINFO_TRANSIENT_ERRORS 0

‎mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,43 @@ show global status like "%peer%";
1919
Variable_name Value
2020
Peer_address_errors 0
2121
select * from performance_schema.host_cache;
22+
IP 192.0.2.4
23+
HOST NULL
24+
HOST_VALIDATED NO
25+
SUM_BLOCKING_ERRORS 0
26+
COUNT_NAMEINFO_TRANSIENT_ERRORS 1
27+
COUNT_NAMEINFO_PERMANENT_ERRORS 0
28+
COUNT_FORMAT_ERRORS 0
29+
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
30+
COUNT_ADDRINFO_PERMANENT_ERRORS 0
31+
COUNT_FCRDNS_ERRORS 0
32+
COUNT_HOST_ACL_ERRORS 1
33+
COUNT_HANDSHAKE_ERRORS 0
34+
COUNT_AUTHENTICATION_ERRORS 0
35+
COUNT_USER_ACL_ERRORS 0
36+
COUNT_LOCAL_ERRORS 0
37+
COUNT_UNKNOWN_ERRORS 0
2238
ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MySQL server
2339
show global status like "%peer%";
2440
Variable_name Value
2541
Peer_address_errors 0
2642
select * from performance_schema.host_cache;
43+
IP 192.0.2.4
44+
HOST NULL
45+
HOST_VALIDATED NO
46+
SUM_BLOCKING_ERRORS 0
47+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
48+
COUNT_NAMEINFO_PERMANENT_ERRORS 0
49+
COUNT_FORMAT_ERRORS 0
50+
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
51+
COUNT_ADDRINFO_PERMANENT_ERRORS 0
52+
COUNT_FCRDNS_ERRORS 0
53+
COUNT_HOST_ACL_ERRORS 2
54+
COUNT_HANDSHAKE_ERRORS 0
55+
COUNT_AUTHENTICATION_ERRORS 0
56+
COUNT_USER_ACL_ERRORS 0
57+
COUNT_LOCAL_ERRORS 0
58+
COUNT_UNKNOWN_ERRORS 0
2759
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
2860
ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MySQL server
2961
show global status like "%peer%";
@@ -33,14 +65,14 @@ select * from performance_schema.host_cache;
3365
IP 192.0.2.4
3466
HOST santa.claus.ipv4.example.com
3567
HOST_VALIDATED YES
36-
SUM_BLOCKING_ERRORS 1
37-
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
68+
SUM_BLOCKING_ERRORS 0
69+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
3870
COUNT_NAMEINFO_PERMANENT_ERRORS 0
3971
COUNT_FORMAT_ERRORS 0
4072
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
4173
COUNT_ADDRINFO_PERMANENT_ERRORS 0
4274
COUNT_FCRDNS_ERRORS 0
43-
COUNT_HOST_ACL_ERRORS 1
75+
COUNT_HOST_ACL_ERRORS 3
4476
COUNT_HANDSHAKE_ERRORS 0
4577
COUNT_AUTHENTICATION_ERRORS 0
4678
COUNT_USER_ACL_ERRORS 0
@@ -54,14 +86,14 @@ select * from performance_schema.host_cache;
5486
IP 192.0.2.4
5587
HOST santa.claus.ipv4.example.com
5688
HOST_VALIDATED YES
57-
SUM_BLOCKING_ERRORS 2
58-
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
89+
SUM_BLOCKING_ERRORS 0
90+
COUNT_NAMEINFO_TRANSIENT_ERRORS 2
5991
COUNT_NAMEINFO_PERMANENT_ERRORS 0
6092
COUNT_FORMAT_ERRORS 0
6193
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
6294
COUNT_ADDRINFO_PERMANENT_ERRORS 0
6395
COUNT_FCRDNS_ERRORS 0
64-
COUNT_HOST_ACL_ERRORS 2
96+
COUNT_HOST_ACL_ERRORS 4
6597
COUNT_HANDSHAKE_ERRORS 0
6698
COUNT_AUTHENTICATION_ERRORS 0
6799
COUNT_USER_ACL_ERRORS 0

0 commit comments

Comments
 (0)