diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-02-13 10:54:04 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-02-13 10:54:04 -0500 |
| commit | 82e677b9479e1152028c242ade16a0a374c6abc7 (patch) | |
| tree | dd32c329ae576946f3a73dda88aa8e45b367f5c6 /vio/viossl.c | |
| parent | 7c08621c5a434d7a5bb931889509176274b3a50e (diff) | |
| parent | 8a34c4bb78ca1afe57819c8be276446f01087f11 (diff) | |
| download | mariadb-git-82e677b9479e1152028c242ade16a0a374c6abc7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 11 |
1 files changed, 0 insertions, 11 deletions
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 */ |