diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-25 16:14:03 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-25 16:14:03 +0000 |
commit | 578b2b05b8f734217336b9dde35b47d52d96de34 (patch) | |
tree | 15f95cbdddfff070573217b73aa6d19cc653b0ae /sql/sql_connect.h | |
parent | 77c41fa725120172c9b379169711d15a6a15a814 (diff) | |
download | mariadb-git-578b2b05b8f734217336b9dde35b47d52d96de34.tar.gz |
MDEV-13641 host errors are not reset after successful connection.
Fixed thd_set_peer_addr() to propagate host error count from
ip_to_hostname() to check_connection(), which tests this count to clear
errors affter successful authentication.
Diffstat (limited to 'sql/sql_connect.h')
-rw-r--r-- | sql/sql_connect.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_connect.h b/sql/sql_connect.h index cd3650fb2b2..67950061da8 100644 --- a/sql/sql_connect.h +++ b/sql/sql_connect.h @@ -85,7 +85,10 @@ bool thd_init_client_charset(THD *thd, uint cs_number); bool setup_connection_thread_globals(THD *thd); bool thd_prepare_connection(THD *thd); bool thd_is_connection_alive(THD *thd); -int thd_set_peer_addr(THD *thd, sockaddr_storage *addr, const char *ip, uint port, bool check_proxy_networks); +int thd_set_peer_addr(THD *thd, sockaddr_storage *addr, + const char *ip, uint port, + bool check_proxy_networks, + uint *host_errors); bool login_connection(THD *thd); void prepare_new_connection_state(THD* thd); |