diff options
| author | monty@narttu.mysql.fi <> | 2003-08-27 02:51:39 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-27 02:51:39 +0300 |
| commit | 66b160c25377903737173b1b351ce6e275415c5e (patch) | |
| tree | df46d43bd0139e95a2e8a1f4acac68f2de3c484f /vio/vio.c | |
| parent | f5a134ba561be8140a0d85f23b132b2df6348f70 (diff) | |
| download | mariadb-git-66b160c25377903737173b1b351ce6e275415c5e.tar.gz | |
vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vio/vio.c b/vio/vio.c index d822651cca6..2b745ab3ec6 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -21,13 +21,7 @@ the file descriptior. */ -#define DONT_MAP_VIO -#include <my_global.h> -#include <mysql_com.h> -#include <my_sys.h> -#include <m_string.h> -#include <violite.h> -#include <errno.h> +#include "vio_priv.h" /* * Helper to fill most of the Vio* with defaults. @@ -61,6 +55,7 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->in_addr =vio_ssl_in_addr; vio->vioblocking =vio_ssl_blocking; vio->is_blocking =vio_is_blocking; + vio->timeout =vio_ssl_timeout; } else /* default is VIO_TYPE_TCPIP */ #endif /* HAVE_OPENSSL */ @@ -77,6 +72,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_timeout; } #endif /* HAVE_VIO */ DBUG_VOID_RETURN; |