summaryrefslogtreecommitdiff
path: root/vio/viossl.c
diff options
context:
space:
mode:
authorrburnett@bk-internal.mysql.com <>2005-05-06 15:15:48 +0200
committerrburnett@bk-internal.mysql.com <>2005-05-06 15:15:48 +0200
commitad6de2c05a3fcfe9a325981b65275562dfa00e70 (patch)
treefc2e2665a3d8e35e9aabc5e2fe3eb3c34d0c85d3 /vio/viossl.c
parent0e91a7131f47fd1312978a239c895086fc7773db (diff)
parentc95e33fadf9add5fa107f675044a407ffbed1b29 (diff)
downloadmariadb-git-ad6de2c05a3fcfe9a325981b65275562dfa00e70.tar.gz
Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
Diffstat (limited to 'vio/viossl.c')
-rw-r--r--vio/viossl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c
index 400d8842fd3..4233b276346 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -424,7 +424,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) */
}