Portability fixes to be able to compile MySQL with VC++

VC++Files/client/mysqlclient.dsp:
  Updated VC++ files for 4.1
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ files for 4.1
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ files for 4.1
VC++Files/myisam/myisam.dsp:
  Updated VC++ files for 4.1
VC++Files/mysys/mysys.dsp:
  Updated VC++ files for 4.1
VC++Files/sql/mysqld.dsp:
  Updated VC++ files for 4.1
VC++Files/strings/strings.dsp:
  Updated VC++ files for 4.1
client/mysql.cc:
  Update for windows
heap/_check.c:
  Fixed wrong DBUG_PRINT() usage
include/mysql.h:
  Portability fix (uint -> unsigned int)
libmysql/libmysql.def:
  Removed old my_casecmp function
sql/ha_innodb.cc:
  Update for windows
sql/init.cc:
  Removed not used variable
sql/log.cc:
  Removed not used variable
sql/net_pkg.cc:
  Portability fix
sql/sql_db.cc:
  Portability fixes.  Removed not used variables
sql/sql_lex.h:
  Portability fix
sql/sql_parse.cc:
  Portability fix
sql/sql_prepare.cc:
  Removed not used variables
sql/sql_select.cc:
  Portability fix
sql/sql_show.cc:
  Portability fix
sql/sql_union.cc:
  Portability fix

1 files changed, 26 insertions, 13 deletions

diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index bd20c75a24e..6eeb1fcd603 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -43,8 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FR /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FR /FD /mktyplib203 /win32 # ADD BASE MTL /c
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x416 /d "NDEBUG"

 # ADD RSC /l 0x416 /d "NDEBUG"

@@ -53,8 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib # SUBTRACT LINK32 /nologo /dll /pdb:none /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
 

 !ELSEIF  "$(CFG)" == "libmysqld - Win32 Debug"

 

@@ -70,8 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MT /W3 /Gm /Zi /Od /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD CPP /nologo /MT /W3 /Gm /Zi /Od /I "../include" /I "../sql" /I "../regex" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /mktyplib203 /win32 # ADD BASE MTL /c
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x416 /d "_DEBUG"

 # ADD RSC /l 0x416 /d "_DEBUG"

@@ -80,8 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib  ..\lib_debug\innodb.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib # SUBTRACT LINK32 /nologo /dll /pdb:none /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib"
 

 !ENDIF 

 

@@ -119,6 +115,10 @@ SOURCE=..\libmysql\get_password.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\sql\gstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\ha_berkeley.cpp

 # End Source File

 # Begin Source File

@@ -176,6 +176,7 @@ SOURCE=..\sql\item_create.cpp
 # Begin Source File

 

 SOURCE=..\sql\item_func.cpp

+# ADD CPP /I "../zlib"
 # End Source File

 # Begin Source File

 

@@ -183,6 +184,10 @@ SOURCE=..\sql\item_strfunc.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=..\sql\item_subselect.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\item_sum.cpp

 # End Source File

 # Begin Source File

@@ -271,7 +276,7 @@ SOURCE=..\sql\set_var.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\sql\slave.cpp

+SOURCE=..\sql\spatial.cpp
 # End Source File

 # Begin Source File

 

@@ -307,10 +312,18 @@ SOURCE=..\sql\sql_delete.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=..\sql\sql_derived.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_do.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=..\sql\sql_error.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_handler.cpp

 # End Source File

 # Begin Source File

@@ -327,10 +340,6 @@ SOURCE=..\sql\sql_list.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\sql\sql_load.cpp
-# End Source File

-# Begin Source File

-

 SOURCE=..\sql\sql_manager.cpp

 # End Source File

 # Begin Source File

@@ -340,6 +349,10 @@ SOURCE=..\sql\sql_map.cpp
 # Begin Source File

 

 SOURCE=..\sql\sql_parse.cpp

+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_prepare.cpp
 # End Source File

 # Begin Source File