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 | ae387d0ddc9c5534aeae6b1d80f650dcc46e78be (patch) | |
| tree | f7feeb6b7dbdf2dd8b64422121decec13f0ae311 /vio | |
| parent | f7f578567a57c93dc9baa7cd5bc17942702daf21 (diff) | |
| parent | 87eae831a4cba0ac8c2385035554229b850d2a68 (diff) | |
| download | mariadb-git-ae387d0ddc9c5534aeae6b1d80f650dcc46e78be.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 'vio')
| -rw-r--r-- | vio/viosocket.c | 2 | ||||
| -rw-r--r-- | vio/viossl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 202d70b6c26..fee97daa943 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -276,7 +276,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; |