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

8 files changed, 107 insertions, 14 deletions

diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index d03623cedb9..7bc38eb913a 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -136,6 +136,10 @@ SOURCE="..\strings\ctype-latin1_de.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-simple.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-sjis.c"
 # End Source File
 # Begin Source File
diff --git a/VC++Files/fix-project-files b/VC++Files/fix-project-files
new file mode 100755
index 00000000000..b63ceab318a
--- /dev/null
+++ b/VC++Files/fix-project-files
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# Change linefeed -> return+linefeed for all VC++ project files
+# 
+
+find . \( -name "*.dsp" -o -name "*.dsw" \) -print | grep -v "SCCS" | xargs replace '\r\$' '
' '\$' '
' --
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index ea5ef096561..6b86c69917c 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-latin1_de.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-simple.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-sjis.c"
 # End Source File
 # Begin Source File
@@ -256,6 +260,7 @@ SOURCE=..\mysys\my_alloc.c
 # Begin Source File
 
 SOURCE=..\mysys\my_compress.c
+# ADD CPP /I "../zlib"
 # End Source File
 # Begin Source File
 
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

 

diff --git a/VC++Files/myisam/myisam.dsp b/VC++Files/myisam/myisam.dsp
index 8346cddbc54..96cb85f7139 100644
--- a/VC++Files/myisam/myisam.dsp
+++ b/VC++Files/myisam/myisam.dsp
@@ -265,8 +265,28 @@ SOURCE=.\mi_write.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rt_index.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_key.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_mbr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_split.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\sort.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\sp_key.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -279,6 +299,10 @@ SOURCE=.\ft_eval.h
 
 SOURCE=.\myisamdef.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\rt_index.h
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index c4c21d9a6db..fb92fce0e2e 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -326,6 +326,10 @@ SOURCE=.\my_getwd.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\my_handler.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\my_init.c
 # End Source File
 # Begin Source File
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
diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp
index 52655947790..1433b8d05f6 100644
--- a/VC++Files/strings/strings.dsp
+++ b/VC++Files/strings/strings.dsp
@@ -128,6 +128,10 @@ SOURCE=".\ctype-latin1_de.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-simple.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-sjis.c"
 # End Source File
 # Begin Source File