bk commit into 4.1 tree (jimw:1.2324)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jwinstead. When jwinstead does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2324 05/06/08 01:25:06 jimw@stripped +3 -0
  Fix Windows build warning and file missing from projects.

  vio/viosocket.c
    1.31 05/06/08 01:24:00 jimw@stripped +1 -0
    Add missing parameter

  VC++Files/client/mysqlclient.dsp
    1.31 05/06/08 01:16:26 jimw@stripped +4 -0
    Add missing file

  VC++Files/libmysql/libmysql.dsp
    1.29 05/06/08 01:16:15 jimw@stripped +4 -0
    Add missing file

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	production.mysql.com
# Root:	/usersnfs/jwinstead/my/mysql-4.1-win

--- 1.30/VC++Files/client/mysqlclient.dsp	2005-05-24 22:42:38 +02:00
+++ 1.31/VC++Files/client/mysqlclient.dsp	2005-06-08 01:16:26 +02:00
@@ -322,6 +322,10 @@
 # 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

--- 1.28/VC++Files/libmysql/libmysql.dsp	2005-05-24 22:42:38 +02:00
+++ 1.29/VC++Files/libmysql/libmysql.dsp	2005-06-08 01:16:15 +02:00
@@ -295,6 +295,10 @@
 # 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

--- 1.30/vio/viosocket.c	2005-05-06 15:03:20 +02:00
+++ 1.31/vio/viosocket.c	2005-06-08 01:24:00 +02:00
@@ -379,6 +379,7 @@
 
 
 void vio_ignore_timeout(Vio *vio __attribute__((unused)),
+			uint which __attribute__((unused)),
 			uint timeout __attribute__((unused)))
 {
 }