Commit a487f2f0 authored by unknown's avatar unknown
Browse files

Manual merge of 5.0.10a back to the general tree. 


configure.in:
  Manual merge of 5.0.10a back to the general tree, general version remains 5.0.11.
parents 2562ba55 26ae9152

sql/hostname.cc

+2 −2
Original line number Diff line number Diff line
@@ -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))   // is expanded inline by gcc

    DBUG_RETURN((char *)my_localhost);



  /* Check first if we have name in cache */

  if (!(specialflag & SPECIAL_NO_HOST_CACHE))