summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-01-25 12:06:55 -0800
committerunknown <jimw@mysql.com>2005-01-25 12:06:55 -0800
commite1b8a004fea3aca320d3d8fa36dfd7932ab045ca (patch)
tree6eba82bf12f39ade3bb5bcddcc938ff32f334a3d /vio
parent803774958cb576e04213fd9ab14e78d1b588f8fd (diff)
downloadmariadb-git-e1b8a004fea3aca320d3d8fa36dfd7932ab045ca.tar.gz
Always call vio_in_addr() so that thd->remote is
always initialized. (Bug #5569) vio/viosocket.c: Remove comment that is no longer correct sql/sql_parse.cc: Always call vio_in_addr() on successful connection, so that thd->remote always gets set vio/viossl.c: Remove comment that is no longer correct
Diffstat (limited to 'vio')
-rw-r--r--vio/viosocket.c2
-rw-r--r--vio/viossl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index ad156fc33bf..1b6f46c57cf 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -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;
diff --git a/vio/viossl.c b/vio/viossl.c
index a489cb98f98..07713c83763 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -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;