summaryrefslogtreecommitdiff
path: root/vio/vio.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-08-17 00:35:51 +0300
committermonty@hundin.mysql.fi <>2002-08-17 00:35:51 +0300
commit5773b6504a888d61af1cdf7c0764bff7860ab90a (patch)
treea5bba2df04761e778b4e626fc71182b2708f85ff /vio/vio.c
parent5ff30464a68f70e01664a0af8dd9406e839c99ab (diff)
downloadmariadb-git-5773b6504a888d61af1cdf7c0764bff7860ab90a.tar.gz
Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column. Fixed bug in pthread_mutex_trylock with HPUX 11.0
Diffstat (limited to 'vio/vio.c')
-rw-r--r--vio/vio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/vio.c b/vio/vio.c
index bb97f195110..445aec3e3a7 100644
--- a/vio/vio.c
+++ b/vio/vio.c
@@ -60,7 +60,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
vio->vioclose =vio_ssl_close;
vio->peer_addr =vio_ssl_peer_addr;
vio->in_addr =vio_ssl_in_addr;
- vio->vioblocking =vio_blocking;
+ vio->vioblocking =vio_ssl_blocking;
vio->is_blocking =vio_is_blocking;
}
else /* default is VIO_TYPE_TCPIP */