Skip to content

Commit 7eb5699

Browse files
marcalffmarcalff
committed
Work in progress
1 parent 32b56ed commit 7eb5699

File tree

45 files changed

+705
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+705
-444
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ select
2121
COUNT_MAX_USER_CONNECTION_ERRORS,
2222
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
2323
COUNT_MAX_CONNECTION_ERRORS,
24-
COUNT_USER_ACL_ERRORS,
24+
COUNT_DEFAULT_DATABASE_ERRORS,
25+
COUNT_INIT_CONNECT_ERRORS,
2526
COUNT_LOCAL_ERRORS,
2627
COUNT_UNKNOWN_ERRORS,
2728
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
3838
COUNT_MAX_USER_CONNECTION_ERRORS,
3939
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
4040
COUNT_MAX_CONNECTION_ERRORS,
41-
COUNT_USER_ACL_ERRORS,
41+
COUNT_DEFAULT_DATABASE_ERRORS,
42+
COUNT_INIT_CONNECT_ERRORS,
4243
COUNT_LOCAL_ERRORS,
4344
COUNT_UNKNOWN_ERRORS,
4445
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS 0
6667
COUNT_MAX_USER_CONNECTION_ERRORS 0
6768
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6869
COUNT_MAX_CONNECTION_ERRORS 0
69-
COUNT_USER_ACL_ERRORS 0
70+
COUNT_DEFAULT_DATABASE_ERRORS 0
71+
COUNT_INIT_CONNECT_ERRORS 0
7072
COUNT_LOCAL_ERRORS 0
7173
COUNT_UNKNOWN_ERRORS 0
7274
FIRST_ERROR_SEEN set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
9799
COUNT_MAX_USER_CONNECTION_ERRORS,
98100
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
99101
COUNT_MAX_CONNECTION_ERRORS,
100-
COUNT_USER_ACL_ERRORS,
102+
COUNT_DEFAULT_DATABASE_ERRORS,
103+
COUNT_INIT_CONNECT_ERRORS,
101104
COUNT_LOCAL_ERRORS,
102105
COUNT_UNKNOWN_ERRORS,
103106
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS 0
125128
COUNT_MAX_USER_CONNECTION_ERRORS 0
126129
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
127130
COUNT_MAX_CONNECTION_ERRORS 0
128-
COUNT_USER_ACL_ERRORS 0
131+
COUNT_DEFAULT_DATABASE_ERRORS 0
132+
COUNT_INIT_CONNECT_ERRORS 0
129133
COUNT_LOCAL_ERRORS 0
130134
COUNT_UNKNOWN_ERRORS 0
131135
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
3232
COUNT_MAX_USER_CONNECTION_ERRORS,
3333
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
3434
COUNT_MAX_CONNECTION_ERRORS,
35-
COUNT_USER_ACL_ERRORS,
35+
COUNT_DEFAULT_DATABASE_ERRORS,
36+
COUNT_INIT_CONNECT_ERRORS,
3637
COUNT_LOCAL_ERRORS,
3738
COUNT_UNKNOWN_ERRORS,
3839
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS 0
6061
COUNT_MAX_USER_CONNECTION_ERRORS 0
6162
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6263
COUNT_MAX_CONNECTION_ERRORS 0
63-
COUNT_USER_ACL_ERRORS 0
64+
COUNT_DEFAULT_DATABASE_ERRORS 0
65+
COUNT_INIT_CONNECT_ERRORS 0
6466
COUNT_LOCAL_ERRORS 0
6567
COUNT_UNKNOWN_ERRORS 0
6668
FIRST_ERROR_SEEN set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
8688
COUNT_MAX_USER_CONNECTION_ERRORS,
8789
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
8890
COUNT_MAX_CONNECTION_ERRORS,
89-
COUNT_USER_ACL_ERRORS,
91+
COUNT_DEFAULT_DATABASE_ERRORS,
92+
COUNT_INIT_CONNECT_ERRORS,
9093
COUNT_LOCAL_ERRORS,
9194
COUNT_UNKNOWN_ERRORS,
9295
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS 0
114117
COUNT_MAX_USER_CONNECTION_ERRORS 0
115118
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
116119
COUNT_MAX_CONNECTION_ERRORS 0
117-
COUNT_USER_ACL_ERRORS 0
120+
COUNT_DEFAULT_DATABASE_ERRORS 0
121+
COUNT_INIT_CONNECT_ERRORS 0
118122
COUNT_LOCAL_ERRORS 0
119123
COUNT_UNKNOWN_ERRORS 0
120124
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
3838
COUNT_MAX_USER_CONNECTION_ERRORS,
3939
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
4040
COUNT_MAX_CONNECTION_ERRORS,
41-
COUNT_USER_ACL_ERRORS,
41+
COUNT_DEFAULT_DATABASE_ERRORS,
42+
COUNT_INIT_CONNECT_ERRORS,
4243
COUNT_LOCAL_ERRORS,
4344
COUNT_UNKNOWN_ERRORS,
4445
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS 0
6667
COUNT_MAX_USER_CONNECTION_ERRORS 0
6768
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6869
COUNT_MAX_CONNECTION_ERRORS 0
69-
COUNT_USER_ACL_ERRORS 0
70+
COUNT_DEFAULT_DATABASE_ERRORS 0
71+
COUNT_INIT_CONNECT_ERRORS 0
7072
COUNT_LOCAL_ERRORS 0
7173
COUNT_UNKNOWN_ERRORS 0
7274
FIRST_ERROR_SEEN set
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
9799
COUNT_MAX_USER_CONNECTION_ERRORS,
98100
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
99101
COUNT_MAX_CONNECTION_ERRORS,
100-
COUNT_USER_ACL_ERRORS,
102+
COUNT_DEFAULT_DATABASE_ERRORS,
103+
COUNT_INIT_CONNECT_ERRORS,
101104
COUNT_LOCAL_ERRORS,
102105
COUNT_UNKNOWN_ERRORS,
103106
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS 0
125128
COUNT_MAX_USER_CONNECTION_ERRORS 0
126129
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
127130
COUNT_MAX_CONNECTION_ERRORS 0
128-
COUNT_USER_ACL_ERRORS 0
131+
COUNT_DEFAULT_DATABASE_ERRORS 0
132+
COUNT_INIT_CONNECT_ERRORS 0
129133
COUNT_LOCAL_ERRORS 0
130134
COUNT_UNKNOWN_ERRORS 0
131135
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
3232
COUNT_MAX_USER_CONNECTION_ERRORS,
3333
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
3434
COUNT_MAX_CONNECTION_ERRORS,
35-
COUNT_USER_ACL_ERRORS,
35+
COUNT_DEFAULT_DATABASE_ERRORS,
36+
COUNT_INIT_CONNECT_ERRORS,
3637
COUNT_LOCAL_ERRORS,
3738
COUNT_UNKNOWN_ERRORS,
3839
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS 0
6061
COUNT_MAX_USER_CONNECTION_ERRORS 0
6162
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6263
COUNT_MAX_CONNECTION_ERRORS 0
63-
COUNT_USER_ACL_ERRORS 0
64+
COUNT_DEFAULT_DATABASE_ERRORS 0
65+
COUNT_INIT_CONNECT_ERRORS 0
6466
COUNT_LOCAL_ERRORS 0
6567
COUNT_UNKNOWN_ERRORS 0
6668
FIRST_ERROR_SEEN set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
8688
COUNT_MAX_USER_CONNECTION_ERRORS,
8789
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
8890
COUNT_MAX_CONNECTION_ERRORS,
89-
COUNT_USER_ACL_ERRORS,
91+
COUNT_DEFAULT_DATABASE_ERRORS,
92+
COUNT_INIT_CONNECT_ERRORS,
9093
COUNT_LOCAL_ERRORS,
9194
COUNT_UNKNOWN_ERRORS,
9295
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS 0
114117
COUNT_MAX_USER_CONNECTION_ERRORS 0
115118
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
116119
COUNT_MAX_CONNECTION_ERRORS 0
117-
COUNT_USER_ACL_ERRORS 0
120+
COUNT_DEFAULT_DATABASE_ERRORS 0
121+
COUNT_INIT_CONNECT_ERRORS 0
118122
COUNT_LOCAL_ERRORS 0
119123
COUNT_UNKNOWN_ERRORS 0
120124
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ COUNT_SSL_ERRORS,
3838
COUNT_MAX_USER_CONNECTION_ERRORS,
3939
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
4040
COUNT_MAX_CONNECTION_ERRORS,
41-
COUNT_USER_ACL_ERRORS,
41+
COUNT_DEFAULT_DATABASE_ERRORS,
42+
COUNT_INIT_CONNECT_ERRORS,
4243
COUNT_LOCAL_ERRORS,
4344
COUNT_UNKNOWN_ERRORS,
4445
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -66,7 +67,8 @@ COUNT_SSL_ERRORS 0
6667
COUNT_MAX_USER_CONNECTION_ERRORS 0
6768
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6869
COUNT_MAX_CONNECTION_ERRORS 0
69-
COUNT_USER_ACL_ERRORS 0
70+
COUNT_DEFAULT_DATABASE_ERRORS 0
71+
COUNT_INIT_CONNECT_ERRORS 0
7072
COUNT_LOCAL_ERRORS 0
7173
COUNT_UNKNOWN_ERRORS 0
7274
FIRST_ERROR_SEEN null
@@ -97,7 +99,8 @@ COUNT_SSL_ERRORS,
9799
COUNT_MAX_USER_CONNECTION_ERRORS,
98100
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
99101
COUNT_MAX_CONNECTION_ERRORS,
100-
COUNT_USER_ACL_ERRORS,
102+
COUNT_DEFAULT_DATABASE_ERRORS,
103+
COUNT_INIT_CONNECT_ERRORS,
101104
COUNT_LOCAL_ERRORS,
102105
COUNT_UNKNOWN_ERRORS,
103106
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -125,7 +128,8 @@ COUNT_SSL_ERRORS 0
125128
COUNT_MAX_USER_CONNECTION_ERRORS 0
126129
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
127130
COUNT_MAX_CONNECTION_ERRORS 0
128-
COUNT_USER_ACL_ERRORS 0
131+
COUNT_DEFAULT_DATABASE_ERRORS 0
132+
COUNT_INIT_CONNECT_ERRORS 0
129133
COUNT_LOCAL_ERRORS 0
130134
COUNT_UNKNOWN_ERRORS 0
131135
FIRST_ERROR_SEEN null

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
3232
COUNT_MAX_USER_CONNECTION_ERRORS,
3333
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
3434
COUNT_MAX_CONNECTION_ERRORS,
35-
COUNT_USER_ACL_ERRORS,
35+
COUNT_DEFAULT_DATABASE_ERRORS,
36+
COUNT_INIT_CONNECT_ERRORS,
3637
COUNT_LOCAL_ERRORS,
3738
COUNT_UNKNOWN_ERRORS,
3839
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS 0
6061
COUNT_MAX_USER_CONNECTION_ERRORS 0
6162
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6263
COUNT_MAX_CONNECTION_ERRORS 0
63-
COUNT_USER_ACL_ERRORS 0
64+
COUNT_DEFAULT_DATABASE_ERRORS 0
65+
COUNT_INIT_CONNECT_ERRORS 0
6466
COUNT_LOCAL_ERRORS 0
6567
COUNT_UNKNOWN_ERRORS 0
6668
FIRST_ERROR_SEEN set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
8688
COUNT_MAX_USER_CONNECTION_ERRORS,
8789
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
8890
COUNT_MAX_CONNECTION_ERRORS,
89-
COUNT_USER_ACL_ERRORS,
91+
COUNT_DEFAULT_DATABASE_ERRORS,
92+
COUNT_INIT_CONNECT_ERRORS,
9093
COUNT_LOCAL_ERRORS,
9194
COUNT_UNKNOWN_ERRORS,
9295
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS 0
114117
COUNT_MAX_USER_CONNECTION_ERRORS 0
115118
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
116119
COUNT_MAX_CONNECTION_ERRORS 0
117-
COUNT_USER_ACL_ERRORS 0
120+
COUNT_DEFAULT_DATABASE_ERRORS 0
121+
COUNT_INIT_CONNECT_ERRORS 0
118122
COUNT_LOCAL_ERRORS 0
119123
COUNT_UNKNOWN_ERRORS 0
120124
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ COUNT_SSL_ERRORS,
3939
COUNT_MAX_USER_CONNECTION_ERRORS,
4040
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
4141
COUNT_MAX_CONNECTION_ERRORS,
42-
COUNT_USER_ACL_ERRORS,
42+
COUNT_DEFAULT_DATABASE_ERRORS,
43+
COUNT_INIT_CONNECT_ERRORS,
4344
COUNT_LOCAL_ERRORS,
4445
COUNT_UNKNOWN_ERRORS,
4546
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -67,7 +68,8 @@ COUNT_SSL_ERRORS 0
6768
COUNT_MAX_USER_CONNECTION_ERRORS 0
6869
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6970
COUNT_MAX_CONNECTION_ERRORS 0
70-
COUNT_USER_ACL_ERRORS 0
71+
COUNT_DEFAULT_DATABASE_ERRORS 0
72+
COUNT_INIT_CONNECT_ERRORS 0
7173
COUNT_LOCAL_ERRORS 0
7274
COUNT_UNKNOWN_ERRORS 0
7375
FIRST_ERROR_SEEN set
@@ -98,7 +100,8 @@ COUNT_SSL_ERRORS,
98100
COUNT_MAX_USER_CONNECTION_ERRORS,
99101
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
100102
COUNT_MAX_CONNECTION_ERRORS,
101-
COUNT_USER_ACL_ERRORS,
103+
COUNT_DEFAULT_DATABASE_ERRORS,
104+
COUNT_INIT_CONNECT_ERRORS,
102105
COUNT_LOCAL_ERRORS,
103106
COUNT_UNKNOWN_ERRORS,
104107
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -126,7 +129,8 @@ COUNT_SSL_ERRORS 0
126129
COUNT_MAX_USER_CONNECTION_ERRORS 0
127130
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
128131
COUNT_MAX_CONNECTION_ERRORS 0
129-
COUNT_USER_ACL_ERRORS 0
132+
COUNT_DEFAULT_DATABASE_ERRORS 0
133+
COUNT_INIT_CONNECT_ERRORS 0
130134
COUNT_LOCAL_ERRORS 0
131135
COUNT_UNKNOWN_ERRORS 0
132136
FIRST_ERROR_SEEN set

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ COUNT_SSL_ERRORS,
3232
COUNT_MAX_USER_CONNECTION_ERRORS,
3333
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
3434
COUNT_MAX_CONNECTION_ERRORS,
35-
COUNT_USER_ACL_ERRORS,
35+
COUNT_DEFAULT_DATABASE_ERRORS,
36+
COUNT_INIT_CONNECT_ERRORS,
3637
COUNT_LOCAL_ERRORS,
3738
COUNT_UNKNOWN_ERRORS,
3839
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -60,7 +61,8 @@ COUNT_SSL_ERRORS 0
6061
COUNT_MAX_USER_CONNECTION_ERRORS 0
6162
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
6263
COUNT_MAX_CONNECTION_ERRORS 0
63-
COUNT_USER_ACL_ERRORS 0
64+
COUNT_DEFAULT_DATABASE_ERRORS 0
65+
COUNT_INIT_CONNECT_ERRORS 0
6466
COUNT_LOCAL_ERRORS 0
6567
COUNT_UNKNOWN_ERRORS 0
6668
FIRST_ERROR_SEEN set
@@ -86,7 +88,8 @@ COUNT_SSL_ERRORS,
8688
COUNT_MAX_USER_CONNECTION_ERRORS,
8789
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS,
8890
COUNT_MAX_CONNECTION_ERRORS,
89-
COUNT_USER_ACL_ERRORS,
91+
COUNT_DEFAULT_DATABASE_ERRORS,
92+
COUNT_INIT_CONNECT_ERRORS,
9093
COUNT_LOCAL_ERRORS,
9194
COUNT_UNKNOWN_ERRORS,
9295
if (FIRST_ERROR_SEEN is not null, "set", "null") as FIRST_ERROR_SEEN,
@@ -114,7 +117,8 @@ COUNT_SSL_ERRORS 0
114117
COUNT_MAX_USER_CONNECTION_ERRORS 0
115118
COUNT_MAX_USER_CONNECTION_PER_HOUR_ERRORS 0
116119
COUNT_MAX_CONNECTION_ERRORS 0
117-
COUNT_USER_ACL_ERRORS 0
120+
COUNT_DEFAULT_DATABASE_ERRORS 0
121+
COUNT_INIT_CONNECT_ERRORS 0
118122
COUNT_LOCAL_ERRORS 0
119123
COUNT_UNKNOWN_ERRORS 0
120124
FIRST_ERROR_SEEN set

0 commit comments

Comments
 (0)