Commit 30f67d70 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 305fe79c 9a67ecc3

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

+4 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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)))

{

}