Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

e5285acb · monty@hundin.mysql.fi · 10dd73d5 · 5aa46caf · e5285acb · e5285acb
Commit e5285acb authored Aug 29, 2002 by monty@hundin.mysql.fi
32 changed files
--- a/VC++Files/bdb/bdb.dsp
+++ b/VC++Files/bdb/bdb.dsp
@@ -4,7 +4,7 @@

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

-CFG=bdb - Win32 Release
+CFG=bdb - Win32 Max
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,12 @@ CFG=bdb - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "bdb.mak" CFG="bdb - Win32 Release"
+!MESSAGE NMAKE /f "bdb.mak" CFG="bdb - Win32 Max"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "bdb - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "bdb - Win32 Max" (based on "Win32 (x86) Static Library")
-!MESSAGE "bdb - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE 

 # Begin Project
@@ -77,454 +76,534 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_debug\bdb.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\bdb.lib"

-!ELSEIF  "$(CFG)" == "bdb - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "bdb___Win32_Release"
-# PROP BASE Intermediate_Dir "bdb___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "bdb___Win32_Release"
-# PROP Intermediate_Dir "bdb___Win32_Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fo"mysys___Win32_Max/" /Fd"mysys___Win32_Max/" /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fo"mysys___Win32_Max/" /Fd"mysys___Win32_Max/" /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib_release\bdb.lib"
-# ADD LIB32 /nologo /out:"..\lib_release\bdb.lib"
-
 !ENDIF 

 # Begin Target

 # Name "bdb - Win32 Debug"
 # Name "bdb - Win32 Max"
-# Name "bdb - Win32 Release"
 # Begin Group "Source Files"

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File

 SOURCE=.\btree\bt_compare.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_conv.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_curadj.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_cursor.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_delete.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_open.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_put.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_reclaim.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_recno.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_rsearch.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_search.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_split.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_upgrade.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\bt_verify.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\btree\btree_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\crdel_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\crdel_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_app.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_except.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_lock.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_log.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_mpool.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_table.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\cxx\cxx_txn.cpp
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_am.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\db_byteorder.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_cam.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_conv.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_dispatch.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_dup.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\db_err.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\db_getlong.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_iface.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_join.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\db_log2.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_meta.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_overflow.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_pr.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_reclaim.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_ret.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\db_salloc.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\db_shash.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_upg.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_upg_opd.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_vrfy.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\db\db_vrfyutil.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\dbm\dbm.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\env_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\env_open.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\env_recover.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\env\env_region.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_conv.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_dup.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_func.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_meta.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_page.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_reclaim.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_upgrade.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hash\hash_verify.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\hsearch\hsearch.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_conflict.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_deadlock.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_region.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\lock\lock_util.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_archive.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_compare.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_findckp.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_get.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_put.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\log\log_register.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_alloc.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_bh.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_fget.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_fopen.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_fput.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_fset.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_region.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_register.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_sync.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mp\mp_trickle.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mutex\mut_tas.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\mutex\mutex.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_abs.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -533,18 +612,22 @@ SOURCE=.\os\os_alloc.c
 # Begin Source File

 SOURCE=.\os_win32\os_dir.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_errno.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_fid.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_finit.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -557,6 +640,7 @@ SOURCE=.\os\os_handle.c
 # Begin Source File

 SOURCE=.\os_win32\os_map.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -569,6 +653,7 @@ SOURCE=.\os\os_oflags.c
 # Begin Source File

 SOURCE=.\os_win32\os_open.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -577,6 +662,7 @@ SOURCE=.\os\os_region.c
 # Begin Source File

 SOURCE=.\os_win32\os_rename.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -593,70 +679,87 @@ SOURCE=.\os\os_rw.c
 # Begin Source File

 SOURCE=.\os_win32\os_seek.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_sleep.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_spin.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os\os_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os\os_tmpdir.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os_win32\os_type.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\os\os_unlink.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_conv.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_files.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_method.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_open.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_stat.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_upgrade.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\qam\qam_verify.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

@@ -665,38 +768,47 @@ SOURCE=.\clib\strcasecmp.c
 # Begin Source File

 SOURCE=.\txn\txn.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\txn\txn_auto.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\txn\txn_rec.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\txn\txn_region.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\util_log.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\common\util_sig.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\xa\xa.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\xa\xa_db.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # Begin Source File

 SOURCE=.\xa\xa_map.c
+# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
 # End Source File
 # End Group
 # Begin Group "Header Files"

--- a/VC++Files/bdb/build_win32/db_static1.dsp
+++ b/VC++Files/bdb/build_win32/db_static1.dsp
+# Microsoft Developer Studio Project File - Name="db_static1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=db_static1 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "db_static1.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "db_static1.mak" CFG="db_static1 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "db_static1 - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "db_static1 - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "db_static1 - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f db_static.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "db_static.exe"
+# PROP BASE Bsc_Name "db_static.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f db_static.mak"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "db_static1.exe"
+# PROP Bsc_Name "db_static1.bsc"
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "db_static1 - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f db_static.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "db_static.exe"
+# PROP BASE Bsc_Name "db_static.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f db_static.mak"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "db_static1.exe"
+# PROP Bsc_Name "db_static1.bsc"
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "db_static1 - Win32 Release"
+# Name "db_static1 - Win32 Debug"
+
+!IF  "$(CFG)" == "db_static1 - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "db_static1 - Win32 Debug"
+
+!ENDIF 
+
+# Begin Source File
+
+SOURCE=.\db_static.dsp
+# End Source File
+# End Target
+# End Project
--- a/VC++Files/bdb/build_win32/libdb.def
+++ b/VC++Files/bdb/build_win32/libdb.def
+; $Id: libdb.def,v 11.21 2001/01/04 15:07:33 dda Exp $
+
+DESCRIPTION	'Berkeley DB 3.2 Library'
+EXPORTS
+	lock_get				@1
+	lock_id					@2
+	lock_put				@3
+	lock_vec				@4
+	log_compare				@5
+	log_file				@6
+	log_flush				@7
+	log_get					@8
+	log_put					@9
+	log_register				@10
+	log_unregister				@11
+	memp_fclose				@12
+	memp_fget				@13
+	memp_fopen				@14
+	memp_fput				@15
+	memp_fset				@16
+	memp_fsync				@17
+	memp_register				@18
+	memp_sync				@19
+	txn_abort				@20
+	txn_begin				@21
+	txn_checkpoint				@22
+	txn_commit				@23
+	txn_prepare				@24
+	db_version				@25
+	memp_stat				@26
+	log_archive				@27
+	lock_detect				@28
+	txn_id					@29
+	txn_stat				@30
+	memp_trickle				@31
+	log_stat				@32
+	lock_stat				@33
+	db_create				@34
+	db_env_create				@35
+	db_strerror				@36
+	db_xa_switch				@37
+	db_env_set_func_close			@38
+	db_env_set_func_dirfree			@39
+	db_env_set_func_dirlist			@40
+	db_env_set_func_exists			@41
+	db_env_set_func_free			@42
+	db_env_set_func_fsync			@43
+	db_env_set_func_ioinfo			@44
+	db_env_set_func_malloc			@45
+	db_env_set_func_map			@46
+	db_env_set_func_open			@47
+	db_env_set_func_read			@48
+	db_env_set_func_realloc			@49
+	db_env_set_func_rename			@50
+	db_env_set_func_sleep			@51
+	db_env_set_func_unlink			@52
+	db_env_set_func_unmap			@53
+	db_env_set_func_write			@54
+	db_env_set_func_yield			@55
+;	FREE					@56
+	db_env_set_pageyield			@57
+	db_env_set_panicstate			@58
+	db_env_set_region_init			@59
+	db_env_set_tas_spins			@60
+; these are only for testing
+	__db_loadme				@201
+	__ham_func2				@202
+	__ham_func3				@203
+	__ham_func4				@204
+	__ham_func5				@205
+	__db_hcreate				@206
+	__db_hsearch				@207
+	__db_hdestroy				@208
+	__db_dbm_init				@209
+	__db_dbm_delete				@210
+	__db_dbm_fetch				@211
+	__db_dbm_store				@212
+	__db_dbm_firstkey			@213
+	__db_dbm_nextkey			@214
+	__db_dbm_close				@215
+	__db_ndbm_open				@216
+	__db_ndbm_store				@217
+	__db_ndbm_rdonly			@218
+	__db_ndbm_pagfno			@219
+	__db_ndbm_nextkey			@220
+	__db_ndbm_firstkey			@221
+	__db_ndbm_fetch				@222
+	__db_ndbm_error				@223
+	__db_ndbm_dirfno			@224
+	__db_ndbm_delete			@225
+	__db_ndbm_close				@226
+	__db_ndbm_clearerr			@227
+	__lock_dump_region			@228
+	__memp_dump_region			@229
+	__os_closehandle			@230
+	__os_openhandle				@231
+	__os_strdup				@232
+	__db_r_attach				@233
+	__db_r_detach				@234
+	__db_tas_mutex_init			@235
+	__db_tas_mutex_lock			@236
+	__db_tas_mutex_unlock			@237
+	__os_read				@238
+	__os_write				@239
+	__os_open				@240
+	__os_ioinfo				@241
+	__os_free				@242
+	__os_malloc				@243
+	__os_freestr				@244
+	__os_calloc				@245
+	__ham_test				@246
+; these are needed for linking tools
+	__db_dump				@401
+	__db_rpath				@402
+	__db_dispatch				@403
+	__db_err				@404
+	__db_init_print				@405
+	__txn_init_print			@406
+	__log_init_print			@407
+	__ham_init_print			@408
+	__bam_init_print			@409
+	__db_jump				@410
+	__ham_pgin				@411
+	__ham_pgout				@412
+	__bam_pgin				@413
+	__bam_pgout				@414
+	__db_omode				@415
+	__db_prdbt				@416
+	__os_sleep				@417
+	__db_e_stat				@420
+	__db_getlong				@421
+	__os_get_errno				@422
+	__os_set_errno				@423
+	__ham_get_meta				@424
+	__ham_release_meta			@425
+	__qam_init_print			@426
+	__crdel_init_print			@427
+	__qam_pgin_out				@428
+	__db_pgin				@429
+	__db_pgout				@430
+	__db_getulong				@431
+	__db_util_sigresend			@432
+	__db_util_siginit			@433
+	__db_util_interrupted			@434
+	__db_util_logset			@435
+	__db_prheader				@436
+	__db_prfooter				@437
+	__db_verify_callback			@438
+	__db_verify_internal			@439
+	__os_yield				@440
+	__db_global_values			@441
--- a/VC++Files/bdb/build_win32/libdb_tcl.def
+++ b/VC++Files/bdb/build_win32/libdb_tcl.def
+; $Id: libdb_tcl.def,v 11.2 1999/11/21 23:10:00 bostic Exp $
+
+DESCRIPTION     'Berkeley DB TCL interface Library'
+EXPORTS
+	Db_tcl_Init
+	bdb_DbmCommand
+	bdb_HCommand
+	bdb_NdbmOpen
+	bdb_RandCommand
+	db_Cmd
+	dbc_Cmd
+	env_Cmd
+	ndbm_Cmd
+	tcl_EnvRemove
+	tcl_LockDetect
+	tcl_LockGet
+	tcl_LockStat
+	tcl_LockVec
+	tcl_LogArchive
+	tcl_LogCompare
+	tcl_LogFile
+	tcl_LogFlush
+	tcl_LogGet
+	tcl_LogPut
+	tcl_LogRegister
+	tcl_LogStat
+	tcl_LogUnregister
+	tcl_Mp
+	tcl_MpStat
+	tcl_MpSync
+	tcl_MpTrickle
+	tcl_Txn
+	tcl_TxnCheckpoint
+	tcl_TxnStat
+	txn_Cmd
--- a/VC++Files/client/mysql.dsp
+++ b/VC++Files/client/mysql.dsp
@@ -68,7 +68,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -86,6 +87,10 @@ LINK32=link.exe
 # Name "mysql - Win32 Debug"
 # Begin Source File

+SOURCE=..\mysys\my_gethostbyname.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\mysql.cpp

 !IF  "$(CFG)" == "mysql - Win32 Release"

--- a/VC++Files/client/mysqladmin.dsp
+++ b/VC++Files/client/mysqladmin.dsp
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -65,7 +65,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -480,10 +481,6 @@ SOURCE=..\strings\strxmov.c
 # End Source File
 # Begin Source File

-SOURCE=..\strings\strxnmov.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\thr_mutex.c
 # End Source File
 # Begin Source File

--- a/VC++Files/client/mysqldump.dsp
+++ b/VC++Files/client/mysqldump.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/client/mysqlimport.dsp
+++ b/VC++Files/client/mysqlimport.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,7 +68,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/client/mysqlshow.dsp
+++ b/VC++Files/client/mysqlshow.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -4,7 +4,7 @@

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

-CFG=innobase - Win32 Max
+CFG=INNOBASE - WIN32 RELEASE
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,10 @@ CFG=innobase - Win32 Max
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "innobase.mak" CFG="innobase - Win32 Max"
+!MESSAGE NMAKE /f "innobase.mak" CFG="INNOBASE - WIN32 RELEASE"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "innobase - Win32 Max" (based on "Win32 (x86) Static Library")
-!MESSAGE "innobase - Win32 Max nt" (based on "Win32 (x86) Static Library")
 !MESSAGE "innobase - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "innobase - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE 
@@ -30,53 +28,7 @@ CFG=innobase - Win32 Max
 CPP=cl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == "innobase - Win32 Max"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "innobase___Win32_Max"
-# PROP BASE Intermediate_Dir "innobase___Win32_Max"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "innobase___Win32_Max"
-# PROP Intermediate_Dir "innobase___Win32_Max"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
-# ADD BASE RSC /l 0x416 /d "NDEBUG"
-# ADD RSC /l 0x416 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
-# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
-
-!ELSEIF  "$(CFG)" == "innobase - Win32 Max nt"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "innobase___Win32_Max_nt"
-# PROP BASE Intermediate_Dir "innobase___Win32_Max_nt"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "innobase___Win32_Max_nt"
-# PROP Intermediate_Dir "innobase___Win32_Max_nt"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
-# ADD BASE RSC /l 0x416 /d "NDEBUG"
-# ADD RSC /l 0x416 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
-# ADD LIB32 /nologo /out:"..\lib_release\innodb-nt.lib"
-
-!ELSEIF  "$(CFG)" == "innobase - Win32 Debug"
+!IF  "$(CFG)" == "innobase - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -103,13 +55,13 @@ LIB32=link.exe -lib

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "innobase___Win32_Release"
-# PROP BASE Intermediate_Dir "innobase___Win32_Release"
+# PROP BASE Output_Dir "innobase___Win32_Release0"
+# PROP BASE Intermediate_Dir "innobase___Win32_Release0"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "innobase___Win32_Release"
-# PROP Intermediate_Dir "innobase___Win32_Release"
+# PROP Output_Dir "innobase___Win32_Release0"
+# PROP Intermediate_Dir "innobase___Win32_Release0"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
 # ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
@@ -126,8 +78,6 @@ LIB32=link.exe -lib

 # Begin Target

-# Name "innobase - Win32 Max"
-# Name "innobase - Win32 Max nt"
 # Name "innobase - Win32 Debug"
 # Name "innobase - Win32 Release"
 # Begin Source File

--- a/VC++Files/libmysql/libmysql.def
+++ b/VC++Files/libmysql/libmysql.def
+LIBRARY		LIBMYSQL
+DESCRIPTION	'MySQL 4.0 Client Library'
+VERSION		4.0
+EXPORTS
+	mysql_affected_rows
+	mysql_close
+	mysql_data_seek
+	mysql_debug
+	mysql_dump_debug_info
+	mysql_eof
+	mysql_errno
+	mysql_error
+	mysql_escape_string
+	mysql_fetch_field
+	mysql_fetch_field_direct
+	mysql_fetch_fields
+	mysql_fetch_lengths
+	mysql_fetch_row
+	mysql_field_count
+	mysql_field_seek
+	mysql_field_tell
+	mysql_free_result
+	mysql_get_client_info
+	mysql_get_host_info
+	mysql_get_proto_info
+	mysql_get_server_info
+	mysql_info
+	mysql_init
+	mysql_insert_id
+	mysql_kill
+	mysql_list_dbs
+	mysql_list_fields
+	mysql_list_processes
+	mysql_list_tables
+	mysql_num_fields
+	mysql_num_rows
+	mysql_odbc_escape_string
+	mysql_options
+	mysql_ping
+	mysql_query
+	mysql_real_connect
+	mysql_real_query
+	mysql_refresh
+	mysql_row_seek
+	mysql_row_tell
+	mysql_select_db
+	mysql_shutdown
+	mysql_stat
+	mysql_store_result
+	mysql_thread_id
+	mysql_use_result
+	bmove_upp
+	delete_dynamic
+	_dig_vec
+	init_dynamic_array
+	insert_dynamic
+	int2str
+	is_prefix
+	list_add
+	list_delete
+	max_allowed_packet
+	my_casecmp
+	my_init
+	my_end
+	my_strdup
+	my_malloc
+	my_memdup
+	my_no_flags_free
+	my_realloc
+	my_thread_end
+	my_thread_init
+	net_buffer_length
+	set_dynamic
+	strcend
+	strdup_root
+	strfill
+	strinstr
+	strmake
+	strmov
+	strxmov
+	myodbc_remove_escape
+	mysql_thread_safe
+	mysql_character_set_name
+	mysql_change_user
+	mysql_send_query
+	mysql_read_query_result
+	mysql_real_escape_string
+	mysql_ssl_set
+	mysql_real_connect
+	mysql_master_query
+	mysql_master_send_query
+	mysql_slave_query
+	mysql_slave_send_query
+	mysql_enable_rpl_parse
+	mysql_disable_rpl_parse
+	mysql_rpl_parse_enabled
+	mysql_enable_reads_from_master
+	mysql_disable_reads_from_master
+	mysql_reads_from_master_enabled
+	mysql_rpl_query_type
+	mysql_rpl_probe
+	mysql_set_master
+	mysql_add_slave
+
+	
+	
+	
+	
+	
+	
+
+	
+
+
+
+
+
+
--- a/VC++Files/libmysql/libmySQL.dsp
+++ b/VC++Files/libmysql/libmySQL.dsp
@@ -43,7 +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" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "USE_OLD_FUNCTIONS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -59,7 +59,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Move DLL export lib
-PostBuild_Cmds=copy release\libmysql.lib ..\lib_release
+PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /v
 # End Special Build Tool

 !ELSEIF  "$(CFG)" == "libmySQL - Win32 Debug"
@@ -76,7 +76,8 @@ PostBuild_Cmds=copy release\libmysql.lib ..\lib_release
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "." /I "..\include" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "USE_OLD_FUNCTIONS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "." /I "..\include" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -91,7 +92,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Move DLL export lib
-PostBuild_Cmds=copy     debug\libmysql.lib ..\lib_debug
+PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ /v 	xcopy     debug\libmysql.lib ..\lib_debug\ /v
 # End Special Build Tool

 !ENDIF 
@@ -446,10 +447,6 @@ SOURCE=..\strings\strxmov.c
 # End Source File
 # Begin Source File

-SOURCE=..\strings\strxnmov.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\thr_mutex.c
 # End Source File
 # Begin Source File

--- a/VC++Files/libmysqld/libmysqld.def
+++ b/VC++Files/libmysqld/libmysqld.def
+LIBRARY		LIBMYSQLD
+DESCRIPTION	'MySQL 4.0 Embedded Server Library'
+VERSION		4.0
+EXPORTS
+	mysql_server_end
+	mysql_server_init
+	mysql_use_result
+	mysql_thread_safe
+	mysql_thread_id
+	mysql_store_result
+	mysql_stat
+	mysql_shutdown
+	mysql_select_db
+	mysql_row_tell
+	mysql_row_seek
+	mysql_real_query
+	mysql_real_connect
+	mysql_query
+	mysql_ping
+	mysql_options
+	mysql_num_rows
+	mysql_num_fields
+	mysql_list_tables
+	mysql_list_processes
+	mysql_list_fields
+	mysql_list_dbs
+	mysql_kill
+	mysql_insert_id
+	mysql_init
+	mysql_info
+	mysql_get_server_info
+	mysql_get_proto_info
+	mysql_get_host_info
+	mysql_get_client_info
+	mysql_free_result
+	mysql_field_tell
+	mysql_field_count
+	mysql_field_seek
+	mysql_fetch_row
+	mysql_fetch_lengths
+	mysql_fetch_fields
+	mysql_fetch_field_direct
+	mysql_fetch_field
+	mysql_escape_string
+	mysql_real_escape_string
+	mysql_error
+	mysql_errno
+	mysql_eof
+	mysql_dump_debug_info
+	mysql_drop_db
+	mysql_debug
+	mysql_data_seek
+	mysql_create_db
+	mysql_character_set_name
+	mysql_change_user
+	mysql_connect
+	mysql_close
+	mysql_affected_rows
+	mysql_thread_init
+	mysql_thread_end
+	mysql_send_query
+	mysql_read_query_result
+	mysql_refresh
+	mysql_odbc_escape_string
+	myodbc_remove_escape
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -43,7 +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 "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /FR /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 MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x416 /d "NDEBUG"
@@ -53,7 +53,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\vio.lib ..\lib_release\merge.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"
+# 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

 !ELSEIF  "$(CFG)" == "libmysqld - Win32 Debug"
@@ -70,7 +70,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" /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 MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x416 /d "_DEBUG"
@@ -80,7 +80,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\merge.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib ..\lib_debug\vio.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /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

 !ENDIF 
@@ -199,10 +199,6 @@ SOURCE=..\sql\key.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\lib_load.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\lib_sql.cpp
 # End Source File
 # Begin Source File
@@ -271,6 +267,10 @@ SOURCE=..\sql\repl_failsafe.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\sql\set_var.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\slave.cpp
 # End Source File
 # Begin Source File
@@ -327,6 +327,10 @@ 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

--- a/VC++Files/libmysqltest/myTest.dsp
+++ b/VC++Files/libmysqltest/myTest.dsp
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "..\include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "..\include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /Fr /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/libmysqltest/mytest.c
+++ b/VC++Files/libmysqltest/mytest.c
--- a/VC++Files/mysql.dsw
+++ b/VC++Files/mysql.dsw
@@ -141,9 +141,6 @@ Package=<4>
    Project_Dep_Name myisam
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name myisammrg
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name mysys
    End Project Dependency
    Begin Project Dependency
@@ -153,14 +150,11 @@ Package=<4>
    Project_Dep_Name strings
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name vio
+    Project_Dep_Name myisammrg
    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name zlib
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name merge
-    End Project Dependency
 }}}

 ###############################################################################
@@ -444,18 +438,6 @@ Package=<4>

 ###############################################################################

-Project: "mysqldemb"=".\mysqldemb\mysqldemb.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "mysqldump"=".\client\mysqldump.dsp" - Package Owner=<4>

 Package=<5>
@@ -486,54 +468,6 @@ Package=<4>

 ###############################################################################

-Project: "mysqlserver"=".\mysqlserver\mysqlserver.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bdb
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dbug
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name heap
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name innobase
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name merge
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name myisam
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name myisammrg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysqldemb
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysys
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name regex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name strings
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "mysqlshow"=".\client\mysqlshow.dsp" - Package Owner=<4>

 Package=<5>
@@ -690,24 +624,6 @@ Package=<4>

 ###############################################################################

-Project: "test_libmysqld"=".\libmysqld\examples\test_libmysqld.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libmysqld
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysqlclient
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "thr_insert_test"=".\thr_insert_test\thr_insert_test.dsp" - Package Owner=<4>

 Package=<5>

--- a/VC++Files/mysqlbinlog/mysqlbinlog.dsp
+++ b/VC++Files/mysqlbinlog/mysqlbinlog.dsp
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/mysqlcheck/mysqlcheck.dsp
+++ b/VC++Files/mysqlcheck/mysqlcheck.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/mysqlmanager/MySqlManager.dsp
+++ b/VC++Files/mysqlmanager/MySqlManager.dsp
@@ -71,7 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /Zi /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /Fr /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /o "NUL" /win32
 # SUBTRACT MTL /mktyplib203

--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -66,7 +66,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Zi /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /ZI /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe

--- a/VC++Files/pack_isam/pack_isam.dsp
+++ b/VC++Files/pack_isam/pack_isam.dsp
@@ -66,7 +66,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../isam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../isam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/perror/perror.dsp
+++ b/VC++Files/perror/perror.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

--- a/VC++Files/replace/replace.dsp
+++ b/VC++Files/replace/replace.dsp
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40b /d "_DEBUG"
 # ADD RSC /l 0x40b /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../regex" /I "../bdb/build_win32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../regex" /I "../bdb/build_win32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /Fr /YX
 # ADD BASE RSC /l 0x410 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -97,7 +98,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -106,7 +107,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 Wsock32.lib ..\lib_release\dbug.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.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\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
+# 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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.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\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
 # SUBTRACT LINK32 /pdb:none /debug

 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"
@@ -125,7 +126,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../bdb/build_win32" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../bdb/build_win32" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -135,7 +136,7 @@ BSC32=bscmake.exe
 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 Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.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\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
 # SUBTRACT BASE LINK32 /pdb:none /debug
-# 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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb-nt.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe"
+# 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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe"
 # SUBTRACT LINK32 /pdb:none /debug

 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
@@ -154,7 +155,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../bdb/build_win32" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../bdb/build_win32" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -802,6 +803,10 @@ SOURCE=.\repl_failsafe.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\set_var.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\slave.cpp
 # End Source File
 # Begin Source File
@@ -1162,10 +1167,6 @@ SOURCE=.\sql_test.cpp
 # End Source File
 # Begin Source File

-SOURCE=.\sql_udf.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\sql_union.cpp
 # End Source File
 # Begin Source File

--- a/VC++Files/test1/test1.dsp
+++ b/VC++Files/test1/test1.dsp
@@ -67,7 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/thr_insert_test/thr_insert_test.dsp
+++ b/VC++Files/thr_insert_test/thr_insert_test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

--- a/VC++Files/thr_test/thr_test.dsp
+++ b/VC++Files/thr_test/thr_test.dsp
@@ -68,7 +68,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /Zi /Od /I "../include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /Fr /YX
 # ADD BASE RSC /l 0x40b /d "_DEBUG"
 # ADD RSC /l 0x40b /d "_DEBUG"
 BSC32=bscmake.exe

--- a/VC++Files/vio/vio.dsp
+++ b/VC++Files/vio/vio.dsp
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Zi /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /ZI /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

--- a/libmysqld/lib_load.cc
+++ b/libmysqld/lib_load.cc
-/*
- * Copyright (c)  2000
- * SWsoft  company
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use or copy this software for any purpose is hereby granted 
- * without fee, provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- *
- */
-/* Copy data from a textfile to table */
-
-#include "mysql_priv.h"
-#include <my_dir.h>
-#include <m_ctype.h>
-
-
-int
-mysql_load_internal(THD * thd, sql_exchange * ex, TABLE_LIST * table_list,
-                    List<Item> & fields, enum enum_duplicates handle_duplicates,
-                    bool read_file_from_client, thr_lock_type lock_type);
-
-int
-mysql_load(THD * thd, sql_exchange * ex, TABLE_LIST * table_list,
-           List<Item> & fields, enum enum_duplicates handle_duplicates,
-           bool read_file_from_client, thr_lock_type lock_type)
-{
-  read_file_from_client  = 0; //server is always in the same process 
-  return  mysql_load_internal(thd, ex, table_list, fields, handle_duplicates,
-                              read_file_from_client, lock_type);
-}
-
-#define mysql_load mysql_load_internal
-
-
-#if defined (__WIN__)
-#include "../sql/sql_load.cpp"
-#else
-#include "../sql/sql_load.cc"
-#endif
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2096,7 +2096,7 @@ String *Item_func_quote::val_str(String *str)
    0, \, ' and ^Z
  */ 

-  static char escmask[32]=
+  static uchar escmask[32]=
  {
    0x01, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,