diff options
| author | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
| commit | e7d7c0f23630cd75d6912feb4196a84f82566a57 (patch) | |
| tree | 473d25909e3be433119f837f31e252c0c64fca28 /include/violite.h | |
| parent | 9f5a51e8d6344bd2540a36b7bd5efd501fa90745 (diff) | |
| download | mariadb-git-e7d7c0f23630cd75d6912feb4196a84f82566a57.tar.gz | |
Bug #9721 net_write_timeout not used on Windows
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/violite.h b/include/violite.h index b89b01f95f4..4b644051dd2 100644 --- a/include/violite.h +++ b/include/violite.h @@ -81,7 +81,7 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); /* Remotes in_addr */ void vio_in_addr(Vio *vio, struct in_addr *in); my_bool vio_poll_read(Vio *vio,uint timeout); -void vio_timeout(Vio *vio,uint timeout); +void vio_timeout(Vio *vio,uint which, uint timeout); #ifdef HAVE_OPENSSL #include <openssl/opensslv.h> @@ -149,7 +149,7 @@ int vio_close_shared_memory(Vio * 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) -#define vio_timeout(vio, seconds) (vio)->timeout(vio, seconds) +#define vio_timeout(vio, which, seconds) (vio)->timeout(vio, which, seconds) #endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */ /* This enumerator is used in parser - should be always visible */ @@ -189,7 +189,7 @@ struct st_vio void (*in_addr)(Vio*, struct in_addr*); my_bool (*should_retry)(Vio*); int (*vioclose)(Vio*); - void (*timeout)(Vio*, unsigned int timeout); + void (*timeout)(Vio*, unsigned int which, unsigned int timeout); void *ssl_arg; #ifdef HAVE_SMEM HANDLE handle_file_map; |