From bff1b52a101abc17ef05ee1602e261f06da35403 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 7 May 2014 16:12:29 +0200 Subject: [PATCH] revno: 5305.1.1 committer: Marc Alff branch nick: mysql-5.6-bug17156507 timestamp: Tue 2013-07-23 15:08:32 +0200 message: Bug#17156507 SUCCESSFUL CONNECTION ATTEMPT DOESN'T RESET THE SUM_CONNECT_ERRORS COUNTER (test case was merged with perfschema 5.6.17) --- sql/hostname.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/hostname.cc b/sql/hostname.cc index 11cd16ac857..c6c58a0db92 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. Copyright (c) 2011, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify @@ -457,12 +457,12 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage, if (entry) { entry->m_last_seen= now; + *connect_errors= entry->m_errors.m_connect; - if (entry->m_errors.m_connect > max_connect_errors) + if (entry->m_errors.m_connect >= max_connect_errors) { entry->m_errors.m_host_blocked++; entry->set_error_timestamps(now); - *connect_errors= entry->m_errors.m_connect; mysql_mutex_unlock(&hostname_cache->lock); DBUG_RETURN(RC_BLOCKED_HOST); }