Commit 26ae9152 authored by unknown's avatar unknown

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@mysql.com )


configure.in:
  Modify version number.
sql/hostname.cc:
  Fix comparison against INADDR_LOOPBACK to deal with endianness.
  (Originally applied to "sql/hostname.cpp":   1.31 05/07/25 12:07:44 jimw@mysql.com )
parent 46b0edc4
...@@ -6,7 +6,7 @@ AC_PREREQ(2.57)dnl Minimum Autoconf version required. ...@@ -6,7 +6,7 @@ AC_PREREQ(2.57)dnl Minimum Autoconf version required.
AC_INIT(sql/mysqld.cc) AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# Don't forget to also update the NDB lines below. # 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) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
...@@ -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