diff options
| author | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-02 08:21:11 -0800 |
| commit | 33e74b1427c1e211acc1f06e0384e44bd1edac24 (patch) | |
| tree | f7feeb6b7dbdf2dd8b64422121decec13f0ae311 /sql/sql_parse.cc | |
| parent | 6b6e5d4a1612b2c80d5c5f71c3b0ba0ce19d3cc0 (diff) | |
| parent | 22f839cdd23475075e0f1e9eeeb3c7201f9a4262 (diff) | |
| download | mariadb-git-33e74b1427c1e211acc1f06e0384e44bd1edac24.tar.gz | |
Merge fixes for #8248, #5569.
mysql-test/r/func_str.result:
Update results
mysql-test/t/func_str.test:
Merge test
sql/item_strfunc.cc:
Set charset on output string
sql/item_strfunc.h:
Merge
sql/sql_parse.cc:
Merge
vio/viosocket.c:
Merge
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 85cd24c4fbb..e66eeb279d2 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -660,6 +660,8 @@ static int check_connection(THD *thd) 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]; @@ -704,7 +706,6 @@ static int check_connection(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); ulong pkt_len= 0; |