Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/jimw/my/mysql-5.0-clean

Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
4eccc160 · unknown · 85224701 · ec8617c6 · 4eccc160
Commit 4eccc160 authored Jul 27, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/hostname.cc sql/hostname.cc +2 -2

No files found.
--- a/sql/hostname.cc
+++ b/sql/hostname.cc
@@ -143,8 +143,8 @@ my_string ip_to_hostname(struct in_addr *in, uint *errors)
  *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))