From: Date: July 25 2005 9:07pm
Subject: bk commit into 5.0 tree (jimw:1.1891) BUG#11822
List-Archive: http://lists.mysql.com/internals/27562
X-Bug: 11822
Message-Id: <20050725190752.617EFA89A3@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1891 05/07/25 12:07:47 jimw@stripped +1 -0
  Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian
  machines. (Bug #11822)

  sql/hostname.cc
    1.31 05/07/25 12:07:44 jimw@stripped +2 -2
    Fix comparison against INADDR_LOOPBACK to deal with endianness.

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.30/sql/hostname.cc	2005-07-18 17:00:33 -07:00
+++ 1.31/sql/hostname.cc	2005-07-25 12:07:44 -07:00
@@ -143,8 +143,8 @@
   *errors=0;
 
   /* We always treat the loopback address as "localhost". */
-  if (in->s_addr == INADDR_LOOPBACK)
-    return (char *)my_localhost;
+  if (in->s_addr == htonl(INADDR_LOOPBACK))
+    DBUG_RETURN((char *)my_localhost);
 
   /* Check first if we have name in cache */
   if (!(specialflag & SPECIAL_NO_HOST_CACHE))