diff options
| author | unknown <jimw@mysql.com> | 2005-02-01 15:38:27 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-01 15:38:27 -0800 |
| commit | faca00b5d5a7214dc380bb5b0fd89ea2648d41d2 (patch) | |
| tree | 1579c084c6abd017cce5a3e3a1ee787651ac05cd /sql/sql_parse.cc | |
| parent | 3c04bddb04774237acd11a7ef2c0207a49149a0e (diff) | |
| parent | e1b8a004fea3aca320d3d8fa36dfd7932ab045ca (diff) | |
| download | mariadb-git-faca00b5d5a7214dc380bb5b0fd89ea2648d41d2.tar.gz | |
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
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 275b76db177..cd0abafc0c9 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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); |