From: Alexander Nozdrin
Date: April 8 2011 9:27am
Subject: bzr commit into mysql-5.5 branch (alexander.nozdrin:3429) Bug#12325375
List-Archive: http://lists.mysql.com/commits/135037
X-Bug: 12325375
Message-Id: <201104080927.p389RmFp017536@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2978292523603263247=="

--===============2978292523603263247==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/alik/MySQL/bzr/00/bug12325375/mysql-5.5-bug12325375/ based on revid:gleb.shchepa@stripped

 3429 Alexander Nozdrin	2011-04-08
      A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS
      IF NO DNS-SERVER AVAILABLE.
      
      The thing is that on Windows XP getnameinfo() returns WSANO_DATA
      when hostname-lookup is not available. The problem was that
      this error code was treated as serious error and the client
      connection got rejected.
      
      The fix is to treat all errors from getnameinfo() as not ciritical,
      but add IP-address to the host cache only for EAI_NONAME (or WSANO_DATA).

    modified:
      include/violite.h
      sql/hostname.cc
      vio/viosocket.c
=== modified file 'include/violite.h'
--- a/include/violite.h	2010-06-07 14:01:39 +0000
+++ b/include/violite.h	2011-04-08 09:27:38 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -93,6 +93,8 @@ ssize_t vio_pending(Vio *vio);
 my_bool vio_get_normalized_ip_string(const struct sockaddr *addr, int addr_length,
                                      char *ip_string, size_t ip_string_size);
 
+my_bool vio_is_no_name_error(int err_code);
+
 int vio_getnameinfo(const struct sockaddr *sa,
                     char *hostname, size_t hostname_size,
                     char *port, size_t port_size,

=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2010-07-23 20:17:55 +0000
+++ b/sql/hostname.cc	2011-04-08 09:27:38 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -366,41 +366,33 @@ bool ip_to_hostname(struct sockaddr_stor
   err_code= vio_getnameinfo(ip, hostname_buffer, NI_MAXHOST, NULL, 0,
                             NI_NAMEREQD);
 
-  if (err_code == EAI_NONAME)
+  if (err_code)
   {
-    /*
-      There is no reverse address mapping for the IP address. A host name
-      can not be resolved.
-    */
-
-    DBUG_PRINT("error", ("IP address '%s' could not be resolved: "
-                         "no reverse address mapping.",
-                         (const char *) ip_key));
-
-    sql_print_warning("IP address '%s' could not be resolved: "
-                      "no reverse address mapping.",
-                      (const char *) ip_key);
+    DBUG_PRINT("error", ("IP address '%s' could not be resolved: %s.",
+                         (const char *) ip_key,
+                         (const char *) gai_strerror(err_code)));
 
-    err_status= add_hostname(ip_key, NULL);
+    sql_print_warning("IP address '%s' could not be resolved: %s.",
+                      (const char *) ip_key,
+                      (const char *) gai_strerror(err_code));
 
-    *hostname= NULL;
-    *connect_errors= 0; /* New IP added to the cache. */
+    if (vio_is_no_name_error(err_code))
+    {
+      /*
+        The no-name error means that there is no reverse address mapping
+        for the IP address. A host name can not be resolved.
+
+        If it is not the no-name error, we should not cache the hostname
+        (or rather its absence), because the failure might be transient.
+      */
 
-    DBUG_RETURN(err_status);
-  }
-  else if (err_code)
-  {
-    DBUG_PRINT("error", ("IP address '%s' could not be resolved: "
-                         "getnameinfo() returned %d.",
-                         (const char *) ip_key,
-                         (int) err_code));
+      add_hostname(ip_key, NULL);
 
-    sql_print_warning("IP address '%s' could not be resolved: "
-                      "getnameinfo() returned error (code: %d).",
-                      (const char *) ip_key,
-                      (int) err_code);
+      *hostname= NULL;
+      *connect_errors= 0; /* New IP added to the cache. */
+    }
 
-    DBUG_RETURN(TRUE);
+    DBUG_RETURN(FALSE);
   }
 
   DBUG_PRINT("info", ("IP '%s' resolved to '%s'.",

=== modified file 'vio/viosocket.c'
--- a/vio/viosocket.c	2010-08-16 12:50:27 +0000
+++ b/vio/viosocket.c	2011-04-08 09:27:38 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1059,6 +1059,34 @@ ssize_t vio_pending(Vio *vio)
 }
 
 
+/**
+  Checks if the error code, returned by vio_getnameinfo(), means it was the
+  "No-name" error.
+
+  Windows-specific note: getnameinfo() returns WSANO_DATA instead of
+  EAI_NODATA or EAI_NONAME when no reverse mapping is available at the host
+  (i.e. Windows can't get hostname by IP-address). This error should be
+  treated as EAI_NONAME.
+
+  @return if the error code is actually EAI_NONAME.
+  @retval true if the error code is EAI_NONAME.
+  @retval false otherwise.
+*/
+
+my_bool vio_is_no_name_error(int err_code)
+{
+#ifdef _WIN32
+
+  return err_code == WSANO_DATA || err_code == EAI_NONAME;
+
+#else
+
+  return err_code == EAI_NONAME;
+
+#endif
+}
+
+
 /**
   This is a wrapper for the system getnameinfo(), because different OS
   differ in the getnameinfo() implementation:


--===============2978292523603263247==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   7ywl2h3rqwftppqv
# target_branch: file:///home/alik/MySQL/bzr/00/bug12325375/mysql-5.5-\
#   bug12325375/
# testament_sha1: 9ffded763eb0ee33fd1e6347a127ac238c13245f
# timestamp: 2011-04-08 13:27:44 +0400
# base_revision_id: gleb.shchepa@stripped\
#   zlg0p10qkmax9gt8
# 
# Begin bundle
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
Wge7wA==


--===============2978292523603263247==--