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 /include/violite.h | |
| 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 'include/violite.h')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 4b644051dd2..fbc6a546cc5 100644 --- a/include/violite.h +++ b/include/violite.h @@ -68,6 +68,8 @@ int vio_fastsend(Vio *vio); int vio_keepalive(Vio *vio, my_bool onoff); /* Whenever we should retry the last read/write operation. */ my_bool vio_should_retry(Vio *vio); +/* Check that operation was timed out */ +my_bool vio_was_interrupted(Vio *vio); /* Short text description of the socket for those, who are curious.. */ const char* vio_description(Vio *vio); /* Return the type of the connection */ @@ -146,6 +148,7 @@ int vio_close_shared_memory(Vio * vio); #define vio_fastsend(vio) (vio)->fastsend(vio) #define vio_keepalive(vio, set_keep_alive) (vio)->viokeepalive(vio, set_keep_alive) #define vio_should_retry(vio) (vio)->should_retry(vio) +#define vio_was_interrupted(vio) (vio)->was_interrupted(vio) #define vio_close(vio) ((vio)->vioclose)(vio) #define vio_peer_addr(vio, buf, prt) (vio)->peer_addr(vio, buf, prt) #define vio_in_addr(vio, in) (vio)->in_addr(vio, in) @@ -188,6 +191,7 @@ struct st_vio my_bool (*peer_addr)(Vio*, char *, uint16*); void (*in_addr)(Vio*, struct in_addr*); my_bool (*should_retry)(Vio*); + my_bool (*was_interrupted)(Vio*); int (*vioclose)(Vio*); void (*timeout)(Vio*, unsigned int which, unsigned int timeout); void *ssl_arg; |