Skip to content

Commit 13857da

Browse files
marcalffmarcalff
committed
Work in progress
1 parent c67ac58 commit 13857da

32 files changed

+1225
-236
lines changed

‎mysql-test/suite/perfschema/include/hostcache_dump.inc

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@
33
show global status like "%peer%";
44
--vertical_results
55
select
6-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
6+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
7+
COUNT_HOST_BLOCKED_ERRORS,
78
COUNT_NAMEINFO_TRANSIENT_ERRORS,
89
COUNT_NAMEINFO_PERMANENT_ERRORS,
910
COUNT_FORMAT_ERRORS,
1011
COUNT_ADDRINFO_TRANSIENT_ERRORS,
1112
COUNT_ADDRINFO_PERMANENT_ERRORS,
1213
COUNT_FCRDNS_ERRORS,
1314
COUNT_HOST_ACL_ERRORS,
15+
COUNT_NO_AUTH_PLUGIN_ERRORS,
16+
COUNT_AUTH_PLUGIN_ERRORS,
1417
COUNT_HANDSHAKE_ERRORS,
1518
COUNT_AUTHENTICATION_ERRORS,
19+
COUNT_PROXY_USER_ERRORS,
20+
COUNT_PROXY_USER_ACL_ERRORS,
1621
COUNT_USER_ACL_ERRORS,
1722
COUNT_LOCAL_ERRORS,
1823
COUNT_UNKNOWN_ERRORS,

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

+24-4
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,21 @@ show global status like "%peer%";
2020
Variable_name Value
2121
Peer_address_errors 0
2222
select
23-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
23+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
24+
COUNT_HOST_BLOCKED_ERRORS,
2425
COUNT_NAMEINFO_TRANSIENT_ERRORS,
2526
COUNT_NAMEINFO_PERMANENT_ERRORS,
2627
COUNT_FORMAT_ERRORS,
2728
COUNT_ADDRINFO_TRANSIENT_ERRORS,
2829
COUNT_ADDRINFO_PERMANENT_ERRORS,
2930
COUNT_FCRDNS_ERRORS,
3031
COUNT_HOST_ACL_ERRORS,
32+
COUNT_NO_AUTH_PLUGIN_ERRORS,
33+
COUNT_AUTH_PLUGIN_ERRORS,
3134
COUNT_HANDSHAKE_ERRORS,
3235
COUNT_AUTHENTICATION_ERRORS,
36+
COUNT_PROXY_USER_ERRORS,
37+
COUNT_PROXY_USER_ACL_ERRORS,
3338
COUNT_USER_ACL_ERRORS,
3439
COUNT_LOCAL_ERRORS,
3540
COUNT_UNKNOWN_ERRORS,
@@ -39,16 +44,21 @@ from performance_schema.host_cache;
3944
IP 192.0.2.4
4045
HOST NULL
4146
HOST_VALIDATED NO
42-
SUM_BLOCKING_ERRORS 0
47+
SUM_CONNECT_ERRORS 0
48+
COUNT_HOST_BLOCKED_ERRORS 0
4349
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4450
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4551
COUNT_FORMAT_ERRORS 0
4652
COUNT_ADDRINFO_TRANSIENT_ERRORS 1
4753
COUNT_ADDRINFO_PERMANENT_ERRORS 0
4854
COUNT_FCRDNS_ERRORS 0
4955
COUNT_HOST_ACL_ERRORS 1
56+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
57+
COUNT_AUTH_PLUGIN_ERRORS 0
5058
COUNT_HANDSHAKE_ERRORS 0
5159
COUNT_AUTHENTICATION_ERRORS 0
60+
COUNT_PROXY_USER_ERRORS 0
61+
COUNT_PROXY_USER_ACL_ERRORS 0
5262
COUNT_USER_ACL_ERRORS 0
5363
COUNT_LOCAL_ERRORS 0
5464
COUNT_UNKNOWN_ERRORS 0
@@ -59,16 +69,21 @@ show global status like "%peer%";
5969
Variable_name Value
6070
Peer_address_errors 0
6171
select
62-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
72+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
73+
COUNT_HOST_BLOCKED_ERRORS,
6374
COUNT_NAMEINFO_TRANSIENT_ERRORS,
6475
COUNT_NAMEINFO_PERMANENT_ERRORS,
6576
COUNT_FORMAT_ERRORS,
6677
COUNT_ADDRINFO_TRANSIENT_ERRORS,
6778
COUNT_ADDRINFO_PERMANENT_ERRORS,
6879
COUNT_FCRDNS_ERRORS,
6980
COUNT_HOST_ACL_ERRORS,
81+
COUNT_NO_AUTH_PLUGIN_ERRORS,
82+
COUNT_AUTH_PLUGIN_ERRORS,
7083
COUNT_HANDSHAKE_ERRORS,
7184
COUNT_AUTHENTICATION_ERRORS,
85+
COUNT_PROXY_USER_ERRORS,
86+
COUNT_PROXY_USER_ACL_ERRORS,
7287
COUNT_USER_ACL_ERRORS,
7388
COUNT_LOCAL_ERRORS,
7489
COUNT_UNKNOWN_ERRORS,
@@ -78,16 +93,21 @@ from performance_schema.host_cache;
7893
IP 192.0.2.4
7994
HOST NULL
8095
HOST_VALIDATED NO
81-
SUM_BLOCKING_ERRORS 0
96+
SUM_CONNECT_ERRORS 0
97+
COUNT_HOST_BLOCKED_ERRORS 0
8298
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
8399
COUNT_NAMEINFO_PERMANENT_ERRORS 0
84100
COUNT_FORMAT_ERRORS 0
85101
COUNT_ADDRINFO_TRANSIENT_ERRORS 2
86102
COUNT_ADDRINFO_PERMANENT_ERRORS 0
87103
COUNT_FCRDNS_ERRORS 0
88104
COUNT_HOST_ACL_ERRORS 2
105+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
106+
COUNT_AUTH_PLUGIN_ERRORS 0
89107
COUNT_HANDSHAKE_ERRORS 0
90108
COUNT_AUTHENTICATION_ERRORS 0
109+
COUNT_PROXY_USER_ERRORS 0
110+
COUNT_PROXY_USER_ACL_ERRORS 0
91111
COUNT_USER_ACL_ERRORS 0
92112
COUNT_LOCAL_ERRORS 0
93113
COUNT_UNKNOWN_ERRORS 0

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

+24-4
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ show global status like "%peer%";
1919
Variable_name Value
2020
Peer_address_errors 0
2121
select
22-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
22+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
23+
COUNT_HOST_BLOCKED_ERRORS,
2324
COUNT_NAMEINFO_TRANSIENT_ERRORS,
2425
COUNT_NAMEINFO_PERMANENT_ERRORS,
2526
COUNT_FORMAT_ERRORS,
2627
COUNT_ADDRINFO_TRANSIENT_ERRORS,
2728
COUNT_ADDRINFO_PERMANENT_ERRORS,
2829
COUNT_FCRDNS_ERRORS,
2930
COUNT_HOST_ACL_ERRORS,
31+
COUNT_NO_AUTH_PLUGIN_ERRORS,
32+
COUNT_AUTH_PLUGIN_ERRORS,
3033
COUNT_HANDSHAKE_ERRORS,
3134
COUNT_AUTHENTICATION_ERRORS,
35+
COUNT_PROXY_USER_ERRORS,
36+
COUNT_PROXY_USER_ACL_ERRORS,
3237
COUNT_USER_ACL_ERRORS,
3338
COUNT_LOCAL_ERRORS,
3439
COUNT_UNKNOWN_ERRORS,
@@ -38,16 +43,21 @@ from performance_schema.host_cache;
3843
IP 192.0.2.4
3944
HOST NULL
4045
HOST_VALIDATED NO
41-
SUM_BLOCKING_ERRORS 0
46+
SUM_CONNECT_ERRORS 0
47+
COUNT_HOST_BLOCKED_ERRORS 0
4248
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4349
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4450
COUNT_FORMAT_ERRORS 0
4551
COUNT_ADDRINFO_TRANSIENT_ERRORS 1
4652
COUNT_ADDRINFO_PERMANENT_ERRORS 0
4753
COUNT_FCRDNS_ERRORS 0
4854
COUNT_HOST_ACL_ERRORS 1
55+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
56+
COUNT_AUTH_PLUGIN_ERRORS 0
4957
COUNT_HANDSHAKE_ERRORS 0
5058
COUNT_AUTHENTICATION_ERRORS 0
59+
COUNT_PROXY_USER_ERRORS 0
60+
COUNT_PROXY_USER_ACL_ERRORS 0
5161
COUNT_USER_ACL_ERRORS 0
5262
COUNT_LOCAL_ERRORS 0
5363
COUNT_UNKNOWN_ERRORS 0
@@ -58,16 +68,21 @@ show global status like "%peer%";
5868
Variable_name Value
5969
Peer_address_errors 0
6070
select
61-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
71+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
72+
COUNT_HOST_BLOCKED_ERRORS,
6273
COUNT_NAMEINFO_TRANSIENT_ERRORS,
6374
COUNT_NAMEINFO_PERMANENT_ERRORS,
6475
COUNT_FORMAT_ERRORS,
6576
COUNT_ADDRINFO_TRANSIENT_ERRORS,
6677
COUNT_ADDRINFO_PERMANENT_ERRORS,
6778
COUNT_FCRDNS_ERRORS,
6879
COUNT_HOST_ACL_ERRORS,
80+
COUNT_NO_AUTH_PLUGIN_ERRORS,
81+
COUNT_AUTH_PLUGIN_ERRORS,
6982
COUNT_HANDSHAKE_ERRORS,
7083
COUNT_AUTHENTICATION_ERRORS,
84+
COUNT_PROXY_USER_ERRORS,
85+
COUNT_PROXY_USER_ACL_ERRORS,
7186
COUNT_USER_ACL_ERRORS,
7287
COUNT_LOCAL_ERRORS,
7388
COUNT_UNKNOWN_ERRORS,
@@ -77,16 +92,21 @@ from performance_schema.host_cache;
7792
IP 192.0.2.4
7893
HOST NULL
7994
HOST_VALIDATED NO
80-
SUM_BLOCKING_ERRORS 0
95+
SUM_CONNECT_ERRORS 0
96+
COUNT_HOST_BLOCKED_ERRORS 0
8197
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
8298
COUNT_NAMEINFO_PERMANENT_ERRORS 0
8399
COUNT_FORMAT_ERRORS 0
84100
COUNT_ADDRINFO_TRANSIENT_ERRORS 2
85101
COUNT_ADDRINFO_PERMANENT_ERRORS 0
86102
COUNT_FCRDNS_ERRORS 0
87103
COUNT_HOST_ACL_ERRORS 2
104+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
105+
COUNT_AUTH_PLUGIN_ERRORS 0
88106
COUNT_HANDSHAKE_ERRORS 0
89107
COUNT_AUTHENTICATION_ERRORS 0
108+
COUNT_PROXY_USER_ERRORS 0
109+
COUNT_PROXY_USER_ACL_ERRORS 0
90110
COUNT_USER_ACL_ERRORS 0
91111
COUNT_LOCAL_ERRORS 0
92112
COUNT_UNKNOWN_ERRORS 0

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

+24-4
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,21 @@ show global status like "%peer%";
2525
Variable_name Value
2626
Peer_address_errors 0
2727
select
28-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
28+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
29+
COUNT_HOST_BLOCKED_ERRORS,
2930
COUNT_NAMEINFO_TRANSIENT_ERRORS,
3031
COUNT_NAMEINFO_PERMANENT_ERRORS,
3132
COUNT_FORMAT_ERRORS,
3233
COUNT_ADDRINFO_TRANSIENT_ERRORS,
3334
COUNT_ADDRINFO_PERMANENT_ERRORS,
3435
COUNT_FCRDNS_ERRORS,
3536
COUNT_HOST_ACL_ERRORS,
37+
COUNT_NO_AUTH_PLUGIN_ERRORS,
38+
COUNT_AUTH_PLUGIN_ERRORS,
3639
COUNT_HANDSHAKE_ERRORS,
3740
COUNT_AUTHENTICATION_ERRORS,
41+
COUNT_PROXY_USER_ERRORS,
42+
COUNT_PROXY_USER_ACL_ERRORS,
3843
COUNT_USER_ACL_ERRORS,
3944
COUNT_LOCAL_ERRORS,
4045
COUNT_UNKNOWN_ERRORS,
@@ -44,16 +49,21 @@ from performance_schema.host_cache;
4449
IP 192.0.2.4
4550
HOST NULL
4651
HOST_VALIDATED YES
47-
SUM_BLOCKING_ERRORS 0
52+
SUM_CONNECT_ERRORS 0
53+
COUNT_HOST_BLOCKED_ERRORS 0
4854
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4955
COUNT_NAMEINFO_PERMANENT_ERRORS 0
5056
COUNT_FORMAT_ERRORS 0
5157
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
5258
COUNT_ADDRINFO_PERMANENT_ERRORS 0
5359
COUNT_FCRDNS_ERRORS 1
5460
COUNT_HOST_ACL_ERRORS 0
61+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
62+
COUNT_AUTH_PLUGIN_ERRORS 0
5563
COUNT_HANDSHAKE_ERRORS 0
5664
COUNT_AUTHENTICATION_ERRORS 0
65+
COUNT_PROXY_USER_ERRORS 0
66+
COUNT_PROXY_USER_ACL_ERRORS 0
5767
COUNT_USER_ACL_ERRORS 0
5868
COUNT_LOCAL_ERRORS 0
5969
COUNT_UNKNOWN_ERRORS 0
@@ -69,16 +79,21 @@ show global status like "%peer%";
6979
Variable_name Value
7080
Peer_address_errors 0
7181
select
72-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
82+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
83+
COUNT_HOST_BLOCKED_ERRORS,
7384
COUNT_NAMEINFO_TRANSIENT_ERRORS,
7485
COUNT_NAMEINFO_PERMANENT_ERRORS,
7586
COUNT_FORMAT_ERRORS,
7687
COUNT_ADDRINFO_TRANSIENT_ERRORS,
7788
COUNT_ADDRINFO_PERMANENT_ERRORS,
7889
COUNT_FCRDNS_ERRORS,
7990
COUNT_HOST_ACL_ERRORS,
91+
COUNT_NO_AUTH_PLUGIN_ERRORS,
92+
COUNT_AUTH_PLUGIN_ERRORS,
8093
COUNT_HANDSHAKE_ERRORS,
8194
COUNT_AUTHENTICATION_ERRORS,
95+
COUNT_PROXY_USER_ERRORS,
96+
COUNT_PROXY_USER_ACL_ERRORS,
8297
COUNT_USER_ACL_ERRORS,
8398
COUNT_LOCAL_ERRORS,
8499
COUNT_UNKNOWN_ERRORS,
@@ -88,16 +103,21 @@ from performance_schema.host_cache;
88103
IP 192.0.2.4
89104
HOST NULL
90105
HOST_VALIDATED YES
91-
SUM_BLOCKING_ERRORS 0
106+
SUM_CONNECT_ERRORS 0
107+
COUNT_HOST_BLOCKED_ERRORS 0
92108
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
93109
COUNT_NAMEINFO_PERMANENT_ERRORS 0
94110
COUNT_FORMAT_ERRORS 0
95111
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
96112
COUNT_ADDRINFO_PERMANENT_ERRORS 0
97113
COUNT_FCRDNS_ERRORS 1
98114
COUNT_HOST_ACL_ERRORS 0
115+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
116+
COUNT_AUTH_PLUGIN_ERRORS 0
99117
COUNT_HANDSHAKE_ERRORS 0
100118
COUNT_AUTHENTICATION_ERRORS 0
119+
COUNT_PROXY_USER_ERRORS 0
120+
COUNT_PROXY_USER_ACL_ERRORS 0
101121
COUNT_USER_ACL_ERRORS 0
102122
COUNT_LOCAL_ERRORS 0
103123
COUNT_UNKNOWN_ERRORS 0

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

+24-4
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ show global status like "%peer%";
1919
Variable_name Value
2020
Peer_address_errors 0
2121
select
22-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
22+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
23+
COUNT_HOST_BLOCKED_ERRORS,
2324
COUNT_NAMEINFO_TRANSIENT_ERRORS,
2425
COUNT_NAMEINFO_PERMANENT_ERRORS,
2526
COUNT_FORMAT_ERRORS,
2627
COUNT_ADDRINFO_TRANSIENT_ERRORS,
2728
COUNT_ADDRINFO_PERMANENT_ERRORS,
2829
COUNT_FCRDNS_ERRORS,
2930
COUNT_HOST_ACL_ERRORS,
31+
COUNT_NO_AUTH_PLUGIN_ERRORS,
32+
COUNT_AUTH_PLUGIN_ERRORS,
3033
COUNT_HANDSHAKE_ERRORS,
3134
COUNT_AUTHENTICATION_ERRORS,
35+
COUNT_PROXY_USER_ERRORS,
36+
COUNT_PROXY_USER_ACL_ERRORS,
3237
COUNT_USER_ACL_ERRORS,
3338
COUNT_LOCAL_ERRORS,
3439
COUNT_UNKNOWN_ERRORS,
@@ -38,16 +43,21 @@ from performance_schema.host_cache;
3843
IP 192.0.2.4
3944
HOST NULL
4045
HOST_VALIDATED YES
41-
SUM_BLOCKING_ERRORS 0
46+
SUM_CONNECT_ERRORS 0
47+
COUNT_HOST_BLOCKED_ERRORS 0
4248
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
4349
COUNT_NAMEINFO_PERMANENT_ERRORS 0
4450
COUNT_FORMAT_ERRORS 0
4551
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
4652
COUNT_ADDRINFO_PERMANENT_ERRORS 0
4753
COUNT_FCRDNS_ERRORS 1
4854
COUNT_HOST_ACL_ERRORS 1
55+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
56+
COUNT_AUTH_PLUGIN_ERRORS 0
4957
COUNT_HANDSHAKE_ERRORS 0
5058
COUNT_AUTHENTICATION_ERRORS 0
59+
COUNT_PROXY_USER_ERRORS 0
60+
COUNT_PROXY_USER_ACL_ERRORS 0
5161
COUNT_USER_ACL_ERRORS 0
5262
COUNT_LOCAL_ERRORS 0
5363
COUNT_UNKNOWN_ERRORS 0
@@ -58,16 +68,21 @@ show global status like "%peer%";
5868
Variable_name Value
5969
Peer_address_errors 0
6070
select
61-
IP, HOST, HOST_VALIDATED, SUM_BLOCKING_ERRORS,
71+
IP, HOST, HOST_VALIDATED, SUM_CONNECT_ERRORS,
72+
COUNT_HOST_BLOCKED_ERRORS,
6273
COUNT_NAMEINFO_TRANSIENT_ERRORS,
6374
COUNT_NAMEINFO_PERMANENT_ERRORS,
6475
COUNT_FORMAT_ERRORS,
6576
COUNT_ADDRINFO_TRANSIENT_ERRORS,
6677
COUNT_ADDRINFO_PERMANENT_ERRORS,
6778
COUNT_FCRDNS_ERRORS,
6879
COUNT_HOST_ACL_ERRORS,
80+
COUNT_NO_AUTH_PLUGIN_ERRORS,
81+
COUNT_AUTH_PLUGIN_ERRORS,
6982
COUNT_HANDSHAKE_ERRORS,
7083
COUNT_AUTHENTICATION_ERRORS,
84+
COUNT_PROXY_USER_ERRORS,
85+
COUNT_PROXY_USER_ACL_ERRORS,
7186
COUNT_USER_ACL_ERRORS,
7287
COUNT_LOCAL_ERRORS,
7388
COUNT_UNKNOWN_ERRORS,
@@ -77,16 +92,21 @@ from performance_schema.host_cache;
7792
IP 192.0.2.4
7893
HOST NULL
7994
HOST_VALIDATED YES
80-
SUM_BLOCKING_ERRORS 0
95+
SUM_CONNECT_ERRORS 0
96+
COUNT_HOST_BLOCKED_ERRORS 0
8197
COUNT_NAMEINFO_TRANSIENT_ERRORS 0
8298
COUNT_NAMEINFO_PERMANENT_ERRORS 0
8399
COUNT_FORMAT_ERRORS 0
84100
COUNT_ADDRINFO_TRANSIENT_ERRORS 0
85101
COUNT_ADDRINFO_PERMANENT_ERRORS 0
86102
COUNT_FCRDNS_ERRORS 1
87103
COUNT_HOST_ACL_ERRORS 2
104+
COUNT_NO_AUTH_PLUGIN_ERRORS 0
105+
COUNT_AUTH_PLUGIN_ERRORS 0
88106
COUNT_HANDSHAKE_ERRORS 0
89107
COUNT_AUTHENTICATION_ERRORS 0
108+
COUNT_PROXY_USER_ERRORS 0
109+
COUNT_PROXY_USER_ACL_ERRORS 0
90110
COUNT_USER_ACL_ERRORS 0
91111
COUNT_LOCAL_ERRORS 0
92112
COUNT_UNKNOWN_ERRORS 0

0 commit comments

Comments
 (0)