revno: 5305.1.1

committer: Marc Alff <marc.alff@oracle.com>
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

-/* 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);
       }