Merge jwinstead@production.mysql.com:my/mysql-4.1-win

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

VC++Files/client/mysqlclient.dsp

@@ -322,6 +322,10 @@ SOURCE=..\mysys\mulalloc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_access.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_alloc.c
 # End Source File
 # Begin Source File

VC++Files/libmysql/libmysql.dsp

@@ -295,6 +295,10 @@ SOURCE=..\mysys\mulalloc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_access.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_alloc.c
 # End Source File
 # Begin Source File

vio/viosocket.c

@@ -379,6 +379,7 @@ int vio_close_pipe(Vio * vio)
 
 
 void vio_ignore_timeout(Vio *vio __attribute__((unused)),
+			uint which __attribute__((unused)),
 			uint timeout __attribute__((unused)))
 {
 }