bk commit into 5.0 tree (joerg:1.1966) BUG#11822

[Joerg Bruehe]

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

  sql/hostname.cc
    1.31 05/07/27 13:01:44 joerg@stripped +2 -2
    Fix comparison against INADDR_LOOPBACK to deal with endianness.
    (Originally applied to "sql/hostname.cpp":   1.31 05/07/25 12:07:44 jimw@stripped )

  configure.in
    1.325 05/07/27 13:01:44 joerg@stripped +1 -1
    Modify version number.

# 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:	joerg
# Host:	trift2.
# Root:	/M50/clone-5.0

--- 1.324/configure.in	2005-07-19 01:01:20 +02:00
+++ 1.325/configure.in	2005-07-27 13:01:44 +02:00
@@ -6,7 +6,7 @@
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.0.10-beta)
+AM_INIT_AUTOMAKE(mysql, 5.0.10a-beta)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

--- 1.30/sql/hostname.cc	2005-07-19 02:00:33 +02:00
+++ 1.31/sql/hostname.cc	2005-07-27 13:01:44 +02: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))   // is expanded inline by gcc
+    DBUG_RETURN((char *)my_localhost);
 
   /* Check first if we have name in cache */
   if (!(specialflag & SPECIAL_NO_HOST_CACHE))