diff options
| author | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2005-05-05 17:17:57 +0200 |
| commit | e7d7c0f23630cd75d6912feb4196a84f82566a57 (patch) | |
| tree | 473d25909e3be433119f837f31e252c0c64fca28 /vio/viossl.c | |
| parent | 9f5a51e8d6344bd2540a36b7bd5efd501fa90745 (diff) | |
| download | mariadb-git-e7d7c0f23630cd75d6912feb4196a84f82566a57.tar.gz | |
Bug #9721 net_write_timeout not used on Windows
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 07713c83763..773d444063b 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -421,7 +421,8 @@ int vio_ssl_blocking(Vio * vio __attribute__((unused)), void vio_ssl_timeout(Vio *vio __attribute__((unused)), - uint timeout __attribute__((unused))) + uint which __attribute__((unused)), + uint timeout __attribute__((unused))) { /* Not yet implemented (non critical) */ } |