Commit faca00b5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.0-5569 

into mysql.com:/home/jimw/my/mysql-4.0-clean


sql/sql_parse.cc:
  Auto merged
parents 3c04bddb e1b8a004

sql/sql_parse.cc

+3 −2
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ check_connections(THD *thd) 
	     thd->thread_id));

  DBUG_PRINT("info",("New connection received on %s",

			vio_description(net->vio)));



  vio_in_addr(net->vio,&thd->remote.sin_addr);



  if (!thd->host)                           // If TCP/IP connection

  {

    char ip[30];
@@ -523,7 +526,6 @@ check_connections(THD *thd) 
#endif

    if (!(specialflag & SPECIAL_NO_RESOLVE))

    {

      vio_in_addr(net->vio,&thd->remote.sin_addr);

      thd->host=ip_to_hostname(&thd->remote.sin_addr,&connect_errors);

      /* Cut very long hostnames to avoid possible overflows */

      if (thd->host)
@@ -545,7 +547,6 @@ check_connections(THD *thd) 
    DBUG_PRINT("info",("Host: %s",thd->host));

    thd->host_or_ip= thd->host;

    thd->ip= 0;

    bzero((char*) &thd->remote,sizeof(struct sockaddr));

  }

  vio_keepalive(net->vio, TRUE);

vio/viosocket.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ void vio_in_addr(Vio *vio, struct in_addr *in) 
{

  DBUG_ENTER("vio_in_addr");

  if (vio->localhost)

    bzero((char*) in, sizeof(*in));	/* This should never be executed */

    bzero((char*) in, sizeof(*in));

  else

    *in=vio->remote.sin_addr;

  DBUG_VOID_RETURN;

vio/viossl.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ void vio_ssl_in_addr(Vio *vio, struct in_addr *in) 
{

  DBUG_ENTER("vio_ssl_in_addr");

  if (vio->localhost)

    bzero((char*) in, sizeof(*in));	/* This should never be executed */

    bzero((char*) in, sizeof(*in));

  else

    *in=vio->remote.sin_addr;

  DBUG_VOID_RETURN;