diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:44:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:44:05 +0100 |
| commit | 31aee856d83684d4f53e6037d02e1240f694e7cb (patch) | |
| tree | b6759c4bcd7a2db701145b582e202997ba869824 /vio | |
| parent | b93d81a8d10c7a0e03ca3f114ab1ad8066465293 (diff) | |
| parent | 4660f6d5ef3381f1e0981268308fb14796707a4f (diff) | |
| download | mariadb-git-31aee856d83684d4f53e6037d02e1240f694e7cb.tar.gz | |
Merge 192.168.0.10:mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
mysys/default.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/viossl.c | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/vio/vio.c b/vio/vio.c index 6174acd7024..1eeafe483dc 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -96,7 +96,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; + vio->timeout =vio_timeout; } else /* default is VIO_TYPE_TCPIP */ #endif /* HAVE_OPENSSL */ diff --git a/vio/viossl.c b/vio/viossl.c index 62145fe5006..8da9723d7d8 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -416,15 +416,4 @@ int vio_ssl_blocking(Vio * vio __attribute__((unused)), } -void vio_ssl_timeout(Vio *vio __attribute__((unused)), - uint which __attribute__((unused)), - uint timeout __attribute__((unused))) -{ -#ifdef __WIN__ - ulong wait_timeout= (ulong) timeout * 1000; - (void) setsockopt(vio->sd, SOL_SOCKET, - which ? SO_SNDTIMEO : SO_RCVTIMEO, (char*) &wait_timeout, - sizeof(wait_timeout)); -#endif /* __WIN__ */ -} #endif /* HAVE_OPENSSL */ |