diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
| commit | 4576776010d65e7f7277604ca47bf65860ee6744 (patch) | |
| tree | fc2e2665a3d8e35e9aabc5e2fe3eb3c34d0c85d3 /include/violite.h | |
| parent | 0baed276c312dd2e277e0e029f290510c6bdd4d9 (diff) | |
| parent | 6b819860e5fa83f1ba7c6025df8e227775bb1a1b (diff) | |
| download | mariadb-git-4576776010d65e7f7277604ca47bf65860ee6744.tar.gz | |
Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
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 5ee051cb6e7..48046346f8c 100644 --- a/include/violite.h +++ b/include/violite.h @@ -87,7 +87,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> @@ -156,7 +156,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(DONT_MAP_VIO) */ /* This enumerator is used in parser - should be always visible */ @@ -199,7 +199,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; |