Commit 967bf6d3 authored by joerg@mysql.com's avatar joerg@mysql.com

Manual merge of 5.0.10a back to the general tree.

parents f0f2738c bcace631
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -143,8 +143,8 @@ my_string ip_to_hostname(struct in_addr *in, uint *errors) ...@@ -143,8 +143,8 @@ my_string ip_to_hostname(struct in_addr *in, uint *errors)
*errors=0; *errors=0;
/* We always treat the loopback address as "localhost". */ /* 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 */ /* Check first if we have name in cache */
if (!(specialflag & SPECIAL_NO_HOST_CACHE)) if (!(specialflag & SPECIAL_NO_HOST_CACHE))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment