diff options
author | unknown <SergeyV@selena.> | 2005-09-07 14:59:41 +0400 |
---|---|---|
committer | unknown <SergeyV@selena.> | 2005-09-07 14:59:41 +0400 |
commit | c9b589defa19cc955537213337d941c082607813 (patch) | |
tree | 6d7d7c48dfa20e970a334d389572e8177394c300 /vio/vio.c | |
parent | 44e289b45144ffd0afbe50b6ac36b5fb23d68d32 (diff) | |
parent | 1f776a5a45f84dfb4c4e28ef618d7edf1ab048de (diff) | |
download | mariadb-git-c9b589defa19cc955537213337d941c082607813.tar.gz |
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
into selena.:H:/MYSQL/src/#05588-mysql-4.1
BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
include/my_global.h:
SCCS merged
Diffstat (limited to 'vio/vio.c')
-rw-r--r-- | vio/vio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c index 4660efe3048..2d5cb711ffc 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -88,6 +88,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->fastsend =vio_ssl_fastsend; vio->viokeepalive =vio_ssl_keepalive; vio->should_retry =vio_ssl_should_retry; + vio->was_interrupted=vio_was_interrupted; vio->vioclose =vio_ssl_close; vio->peer_addr =vio_ssl_peer_addr; vio->in_addr =vio_ssl_in_addr; @@ -105,6 +106,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->fastsend =vio_fastsend; vio->viokeepalive =vio_keepalive; vio->should_retry =vio_should_retry; + vio->was_interrupted=vio_was_interrupted; vio->vioclose =vio_close; vio->peer_addr =vio_peer_addr; vio->in_addr =vio_in_addr; |