Merge

VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
heap/_check.c:
  Merge: Fixed DBUG_PRINT() usage

1 files changed, 33 insertions, 1 deletions

diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index ac5550ad2b2..47b61fb9c37 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -282,6 +282,10 @@ SOURCE=.\filesort.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\gstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ha_berkeley.cpp
 # End Source File
 # Begin Source File
@@ -460,17 +464,25 @@ SOURCE=.\item_func.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
 
+# ADD CPP /I "../zlib"
+
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"
 
-# ADD CPP /G5
+# ADD CPP /G5 /I "../zlib"
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 nt"
 
+# ADD CPP /I "../zlib"
+
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"
 
+# ADD CPP /I "../zlib"
+
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
+# ADD CPP /I "../zlib"
+
 !ENDIF 
 
 # End Source File
@@ -496,6 +508,10 @@ SOURCE=.\item_strfunc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\item_subselect.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\item_sum.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -811,6 +827,10 @@ SOURCE=.\slave.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\spatial.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_acl.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -927,10 +947,18 @@ SOURCE=.\sql_delete.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sql_derived.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_do.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sql_error.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_handler.cpp
 # End Source File
 # Begin Source File
@@ -1059,6 +1087,10 @@ SOURCE=.\sql_parse.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sql_prepare.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_rename.cpp
 # End Source File
 # Begin Source File