bk commit into 4.1 tree (jani:1.2231) BUG#8467

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2231 05/05/06 12:18:37 jani@stripped +2 -0
  A fix for Bug#8467.

  BitKeeper/etc/logging_ok
    1.382 05/05/06 12:18:36 jani@stripped +1 -0
    Logging to logging@stripped accepted

  sql/hostname.cc
    1.28 05/05/06 12:18:10 jani@stripped +8 -4
    A fix for Bug#8467.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ibmlab.site
# Root:	/home/my/bk/mysql-4.1

--- 1.27/sql/hostname.cc	Fri May  6 01:16:25 2005
+++ 1.28/sql/hostname.cc	Fri May  6 12:18:10 2005
@@ -207,13 +207,17 @@
   {
     VOID(pthread_mutex_unlock(&LOCK_hostname));
     DBUG_PRINT("error",("gethostbyaddr returned %d",errno));
-    goto err;
+
+    if (errno == HOST_NOT_FOUND || errno == NO_DATA)
+	add_wrong_ip(in); /* only cache negative responses, not failures */
+
+    DBUG_RETURN(0);
   }
   if (!hp->h_name[0])				// Don't allow empty hostnames
   {
     VOID(pthread_mutex_unlock(&LOCK_hostname));
     DBUG_PRINT("error",("Got an empty hostname"));
-    goto err;
+    goto add_wrong_ip_and_return;
   }
   if (!(name=my_strdup(hp->h_name,MYF(0))))
   {
@@ -240,7 +244,7 @@
     {
       DBUG_PRINT("error",("mysqld doesn't accept hostnames that starts with a number
followed by a '.'"));
       my_free(name,MYF(0));
-      goto err;
+      goto add_wrong_ip_and_return;
     }
   }
 
@@ -256,7 +260,7 @@
   DBUG_PRINT("error",("Couldn't verify hostname with gethostbyname"));
   my_free(name,MYF(0));
 
-err:
+add_wrong_ip_and_return:
   add_wrong_ip(in);
   DBUG_RETURN(0);
 }

--- 1.381/BitKeeper/etc/logging_ok	Thu May  5 20:45:56 2005
+++ 1.382/BitKeeper/etc/logging_ok	Fri May  6 12:18:36 2005
@@ -86,6 +86,7 @@
 jani@stripped
 jani@hynda.(none)
 jani@stripped
+jani@stripped
 jani@stripped
 jani@stripped
 jani@stripped