Merge mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

1 files changed, 1 insertions, 0 deletions

diff --git a/vio/viosocket.c b/vio/viosocket.c
index ee8e85880ba..c9df242b5c4 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -425,6 +425,7 @@ int vio_close_pipe(Vio * vio)
 
 
 void vio_ignore_timeout(Vio *vio __attribute__((unused)),
+			uint which __attribute__((unused)),
 			uint timeout __attribute__((unused)))
 {
 }