Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0 sql/sql_parse.cc: Auto merged
This commit is contained in:
commit
582d23a188
@ -501,7 +501,7 @@ check_connections(THD *thd)
|
|||||||
#if !defined(HAVE_SYS_UN_H) || defined(HAVE_mit_thread)
|
#if !defined(HAVE_SYS_UN_H) || defined(HAVE_mit_thread)
|
||||||
/* Fast local hostname resolve for Win32 */
|
/* Fast local hostname resolve for Win32 */
|
||||||
if (!strcmp(thd->ip,"127.0.0.1"))
|
if (!strcmp(thd->ip,"127.0.0.1"))
|
||||||
thd->host=(char*) localhost;
|
thd->host= thd->host_or_ip= (char*) localhost;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (!(specialflag & SPECIAL_NO_RESOLVE))
|
if (!(specialflag & SPECIAL_NO_RESOLVE))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user