diff options
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/vio_priv.h | 2 | ||||
| -rw-r--r-- | vio/viosocket.c | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/vio/vio.c b/vio/vio.c index 05bfb220986..a356d8edeff 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -55,6 +55,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->in_addr =vio_in_addr; vio->vioblocking =vio_blocking; vio->is_blocking =vio_is_blocking; + vio->timeout =vio_ignore_timeout; } else /* default is VIO_TYPE_TCPIP */ #endif @@ -73,6 +74,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->in_addr =vio_in_addr; vio->vioblocking =vio_blocking; vio->is_blocking =vio_is_blocking; + vio->timeout =vio_ignore_timeout; } else #endif diff --git a/vio/vio_priv.h b/vio/vio_priv.h index 66a9bde4e0d..9a925a2c4c9 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -23,6 +23,8 @@ #include <m_string.h> #include <violite.h> +void vio_ignore_timeout(Vio *vio, uint timeout); + #ifdef HAVE_OPENSSL #include "my_net.h" /* needed because of struct in_addr */ diff --git a/vio/viosocket.c b/vio/viosocket.c index 9d5c7c0d890..8dea06d4adf 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -355,6 +355,13 @@ int vio_close_pipe(Vio * vio) DBUG_RETURN(r); } + +void vio_ignore_timeout(Vio *vio __attribute__((unused)), + uint timeout __attribute__((unused))) +{ +} + + #ifdef HAVE_SMEM int vio_read_shared_memory(Vio * vio, gptr buf, int size) |