Manual merge of 5.0.10a back to the general tree.

967bf6d3 · joerg@mysql.com · f0f2738c · bcace631 · 967bf6d3
Commit 967bf6d3 authored Jul 28, 2005 by joerg@mysql.com
Hide 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)
+  if (in->s_addr == htonl(INADDR_LOOPBACK))   // is expanded inline by gcc
-    return (char *)my_localhost;
+    DBUG_RETURN((char *)my_localhost);
  /* Check first if we have name in cache */
  if (!(specialflag & SPECIAL_NO_HOST_CACHE))