Updated VC++ project files for 4.0.4

Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables


Docs/manual.texi:
  Changelog
VC++Files/bdb/bdb.dsp:
  Updated project files for 4.0.4
VC++Files/client/mysqlclient.dsp:
  Updated project files for 4.0.4
VC++Files/innobase/innobase.dsp:
  Updated project files for 4.0.4
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated project files for 4.0.4
VC++Files/mysys/mysys.dsp:
  Updated project files for 4.0.4
VC++Files/perror/perror.dsp:
  Updated project files for 4.0.4
VC++Files/sql/mysqld.dsp:
  Updated project files for 4.0.4
client/mysqldump.c:
  Only write short usage if one starts mysqldump without any options
include/config-win.h:
  Added query cache on windows
libmysql/libmysql.def:
  Removed old depricated functions from windows dll
sql/ha_innodb.cc:
  Added missing defines
sql/set_var.cc:
  Code cleanup
sql/sql_acl.cc:
  Added error message if one can't read privilege tables
sql/sql_cache.h:
  Changed some C linkage functions to C++ functions (portability fix)
sql/sql_class.cc:
  Safety fix

7 files changed, 46 insertions, 167 deletions

diff --git a/VC++Files/bdb/bdb.dsp b/VC++Files/bdb/bdb.dsp
index 30d8fdc39b6..e8b730f4254 100644
--- a/VC++Files/bdb/bdb.dsp
+++ b/VC++Files/bdb/bdb.dsp
@@ -61,8 +61,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "bdb___Win32_Max"

-# PROP Intermediate_Dir "bdb___Win32_Max"

+# PROP Output_Dir "max"
+# PROP Intermediate_Dir "max"
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /Fr

@@ -88,522 +88,418 @@ LIB32=link.exe -lib
 # 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

 

@@ -612,22 +508,18 @@ 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

 

@@ -640,7 +532,6 @@ 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

 

@@ -653,7 +544,6 @@ 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

 

@@ -662,7 +552,6 @@ 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

 

@@ -679,87 +568,70 @@ 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

 

@@ -768,47 +640,38 @@ 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"

diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index 4b2f14b7f77..4d70971a363 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -266,6 +266,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/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp
index d7e9a6d808f..a65f607e738 100644
--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "innobase___Win32_Debug"
-# PROP Intermediate_Dir "innobase___Win32_Debug"
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
 # 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 /MTd /W3 /GX /Z7 /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
@@ -60,8 +60,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "innobase___Win32_Release0"
-# PROP Intermediate_Dir "innobase___Win32_Release0"
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
 # 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
diff --git a/VC++Files/mysqlbinlog/mysqlbinlog.dsp b/VC++Files/mysqlbinlog/mysqlbinlog.dsp
index 4145585abc5..94723b0a127 100644
--- a/VC++Files/mysqlbinlog/mysqlbinlog.dsp
+++ b/VC++Files/mysqlbinlog/mysqlbinlog.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" /D "MYSQL_SERVER" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -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 "../" /I "../sql" /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
@@ -88,7 +88,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\mysqlbinlog.cpp
+SOURCE=..\client\mysqlbinlog.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index 61695063376..42213b16cf5 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -26,7 +26,7 @@ CFG=mysys - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysys - Win32 Release"
@@ -49,7 +49,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_release\mysys.lib"
 
@@ -73,7 +73,7 @@ LIB32=link.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\mysys.lib"
 
@@ -86,19 +86,19 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "mysys___Win32_Max"
-# PROP Intermediate_Dir "mysys___Win32_Max"
+# PROP Output_Dir "max"
+# PROP Intermediate_Dir "max"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
 
@@ -283,6 +283,19 @@ SOURCE=.\my_clock.c
 # Begin Source File
 
 SOURCE=.\my_compress.c
+
+!IF  "$(CFG)" == "mysys - Win32 Release"
+
+# ADD CPP /I "../zlib"
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 Debug"
+
+# ADD CPP /I "../zlib"
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 Max"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
diff --git a/VC++Files/perror/perror.dsp b/VC++Files/perror/perror.dsp
index 439fcef1547..3e98e5e5ca9 100644
--- a/VC++Files/perror/perror.dsp
+++ b/VC++Files/perror/perror.dsp
@@ -43,7 +43,8 @@ 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 /GX- /O2 /I "../include" /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" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,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 "_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 CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 7b42eea50f5..093cfb0d925 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -28,7 +28,7 @@ CFG=mysqld - Win32 Release
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -52,7 +52,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:console /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\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-opt.exe"
 # SUBTRACT LINK32 /debug
@@ -78,7 +78,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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 /subsystem:console /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\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld.exe" /pdbtype:sept
 
@@ -92,8 +92,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "NT"
-# PROP Intermediate_Dir "NT"
+# PROP Output_Dir "nt"
+# PROP Intermediate_Dir "nt"
 # PROP Ignore_Export_Lib 0
 # 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
@@ -105,7 +105,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
 # SUBTRACT LINK32 /pdb:none /debug
@@ -120,8 +120,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "mysqld___Win32_Max_nt"
-# PROP Intermediate_Dir "mysqld___Win32_Max_nt"
+# PROP Output_Dir "max_nt"
+# PROP Intermediate_Dir "max_nt"
 # PROP Ignore_Export_Lib 0
 # 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
@@ -133,7 +133,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe"
@@ -149,8 +149,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "mysqld___Win32_Max"
-# PROP Intermediate_Dir "mysqld___Win32_Max"
+# PROP Output_Dir "max"
+# PROP Intermediate_Dir "max"
 # PROP Ignore_Export_Lib 0
 # 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
@@ -162,7 +162,7 @@ LINK32=link.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
+LINK32=xilink6.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\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"../client_release/mysqld-opt.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\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-max.exe"
 # SUBTRACT LINK32 /debug