Merge

client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/protocol.cc:
  SCCS merged

BUILD/compile-pentium-max

@@ -3,9 +3,9 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $fast_cflags"
+extra_flags="$pentium_cflags $fast_cflags -g"
 extra_configs="$pentium_configs"
-strip=yes
+#strip=yes
 
 extra_configs="$extra_configs --with-innodb --with-berkeley-db \
 	--with-embedded-server --enable-thread-safe-client \

Makefile.am

@@ -21,7 +21,8 @@ AUTOMAKE_OPTIONS =	foreign
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE README \
 			COPYING COPYING.LIB
-SUBDIRS =		. include @docs_dirs@ @readline_dir@ \
+SUBDIRS =		. include @docs_dirs@ \
+			@readline_topdir@ @readline_dir@ \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests \
 			BUILD os2 libmysql_r @libmysqld_dirs@ \

VC++Files/bdb/bdb.dsp

@@ -25,7 +25,7 @@ CFG=bdb - Win32 Max
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "bdb - Win32 Debug"
@@ -41,14 +41,13 @@ RSC=rc.exe
 # 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 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
-# SUBTRACT CPP /Fr
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb" /I "../bdb/dbinc" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /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
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\bdb.lib"
 
@@ -66,13 +65,13 @@ LIB32=link.exe -lib
 # 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
-# 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 CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb" /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
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_debug\bdb.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\bdb.lib"
 
@@ -167,34 +166,6 @@ SOURCE=.\db\crdel_rec.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\cxx\cxx_app.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_except.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_lock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_log.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_mpool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_table.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\cxx\cxx_txn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\db\db.c
 # End Source File
 # Begin Source File
@@ -235,6 +206,10 @@ SOURCE=.\common\db_getlong.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\db_idspace.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\db\db_iface.c
 # End Source File
 # Begin Source File
@@ -255,6 +230,10 @@ SOURCE=.\db\db_method.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\db\db_open.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\db\db_overflow.c
 # End Source File
 # Begin Source File
@@ -271,6 +250,14 @@ SOURCE=.\db\db_reclaim.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\db\db_remove.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\db\db_rename.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\db\db_ret.c
 # End Source File
 # Begin Source File
@@ -283,6 +270,10 @@ SOURCE=.\env\db_shash.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\db\db_truncate.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\db\db_upg.c
 # End Source File
 # Begin Source File
@@ -303,6 +294,26 @@ SOURCE=.\dbm\dbm.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\dbreg\dbreg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dbreg\dbreg_auto.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dbreg\dbreg_rec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dbreg\dbreg_util.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\env\env_file.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\env\env_method.c
 # End Source File
 # Begin Source File
@@ -319,6 +330,22 @@ SOURCE=.\env\env_region.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\fileops\fileops_auto.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fileops\fop_basic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fileops\fop_rec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fileops\fop_util.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\hash\hash.c
 # End Source File
 # Begin Source File
@@ -347,6 +374,10 @@ SOURCE=.\hash\hash_method.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\hash\hash_open.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\hash\hash_page.c
 # End Source File
 # Begin Source File
@@ -371,15 +402,15 @@ SOURCE=.\hash\hash_verify.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\hsearch\hsearch.c
+SOURCE=.\hmac\hmac.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lock\lock.c
+SOURCE=.\hsearch\hsearch.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lock\lock_conflict.c
+SOURCE=.\lock\lock.c
 # End Source File
 # Begin Source File
 
@@ -411,18 +442,10 @@ SOURCE=.\log\log_archive.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\log\log_auto.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\log\log_compare.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\log\log_findckp.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\log\log_get.c
 # End Source File
 # Begin Source File
@@ -435,14 +458,6 @@ SOURCE=.\log\log_put.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\log\log_rec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\log\log_register.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\mp\mp_alloc.c
 # End Source File
 # Begin Source File
@@ -495,6 +510,10 @@ SOURCE=.\mutex\mut_tas.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\mutex\mut_win32.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\mutex\mutex.c
 # End Source File
 # Begin Source File
@@ -507,6 +526,14 @@ SOURCE=.\os\os_alloc.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\os_win32\os_clock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os_win32\os_config.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\os_win32\os_dir.c
 # End Source File
 # Begin Source File
@@ -519,15 +546,15 @@ SOURCE=.\os_win32\os_fid.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os_win32\os_finit.c
+SOURCE=.\os_win32\os_fsync.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\os_fsync.c
+SOURCE=.\os_win32\os_handle.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\os_handle.c
+SOURCE=.\os\os_id.c
 # End Source File
 # Begin Source File
 
@@ -563,7 +590,7 @@ SOURCE=.\os\os_rpath.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\os_rw.c
+SOURCE=.\os_win32\os_rw.c
 # End Source File
 # Begin Source File
 
@@ -579,7 +606,7 @@ SOURCE=.\os_win32\os_spin.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\os_stat.c
+SOURCE=.\os_win32\os_stat.c
 # End Source File
 # Begin Source File
 
@@ -635,6 +662,26 @@ SOURCE=.\qam\qam_verify.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rep\rep_method.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rep\rep_record.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rep\rep_region.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rep\rep_util.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hmac\sha1.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\clib\strcasecmp.c
 # End Source File
 # Begin Source File
@@ -647,14 +694,30 @@ SOURCE=.\txn\txn_auto.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\txn\txn_method.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\txn\txn_rec.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\txn\txn_recover.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\txn\txn_region.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\txn\txn_stat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\txn\txn_util.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\util_log.c
 # End Source File
 # Begin Source File

VC++Files/bdb/build_win32/Berkeley_DB.dsw

@@ -566,4 +566,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/client/mysqlclient.dsp

@@ -25,7 +25,7 @@ CFG=mysqlclient - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysqlclient - Win32 Release"
@@ -48,7 +48,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\mysqlclient.lib"
 
@@ -72,7 +72,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\mysqlclient.lib"
 
@@ -382,7 +382,7 @@ SOURCE=..\mysys\my_thr_init.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\mysys\my_vsnprintf.c
+SOURCE=..\strings\my_vsnprintf.c
 # End Source File
 # Begin Source File
 
@@ -490,6 +490,10 @@ 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
@@ -512,5 +516,9 @@ SOURCE=..\vio\viossl.c
 
 SOURCE=..\vio\viosslfactories.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\strings\xml.c
+# End Source File
 # End Target
 # End Project

VC++Files/client/mysqlclient.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/contrib/asm386/zlibvc.dsw

@@ -38,4 +38,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/contrib/minizip/zlibvc.dsw

@@ -38,4 +38,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/dbug/dbug.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/innobase/innobase.dsp

@@ -27,7 +27,7 @@ CFG=INNOBASE - WIN32 RELEASE
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "innobase - Win32 Debug"
@@ -43,14 +43,14 @@ RSC=rc.exe
 # 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" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
 # SUBTRACT CPP /YX
 # 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
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
 # ADD LIB32 /nologo /out:"..\lib_debug\innodb.lib"
 
@@ -74,7 +74,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 /out:"..\lib_release\innodb.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
 
@@ -98,7 +98,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 /out:"..\lib_release\innodb.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
 
@@ -122,7 +122,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 /out:"..\lib_release\innodb.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
 

VC++Files/isam/isam.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/libmysql/libmysql.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/libmysqltest/mytest.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/merge/merge.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/mysql.dsw

@@ -797,4 +797,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/mysqldemb/mysqldemb.dsp

@@ -25,7 +25,7 @@ CFG=mysqldemb - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysqldemb - Win32 Release"
@@ -41,14 +41,14 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
+# ADD CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /FD /c
 # SUBTRACT CPP /YX
 # 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
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
@@ -65,14 +65,14 @@ 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 /MTd /W3 /Gm /Zi /Od /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "../zlib" /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x416 /d "_DEBUG"
 # ADD RSC /l 0x416 /d "_DEBUG"
 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
 
@@ -168,10 +168,18 @@ SOURCE=..\sql\item_func.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\item_row.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\item_strfunc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\item_subselect.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\item_sum.cpp
 # End Source File
 # Begin Source File
@@ -216,10 +224,6 @@ SOURCE=..\sql\mini_client.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\sql\net_pkg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\sql\net_serv.cpp
 # End Source File
 # Begin Source File
@@ -244,6 +248,10 @@ SOURCE=..\sql\procedure.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\protocol.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\records.cpp
 # End Source File
 # Begin Source File
@@ -288,10 +296,18 @@ SOURCE=..\sql\sql_delete.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\sql_derived.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_do.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\sql_error.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_handler.cpp
 # End Source File
 # Begin Source File
@@ -320,6 +336,10 @@ SOURCE=..\sql\sql_parse.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\sql_prepare.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_rename.cpp
 # End Source File
 # Begin Source File

VC++Files/mysqlmanager/mysqlmanager.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

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"
 
@@ -98,7 +98,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 /out:"..\lib_release\mysys.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
 
@@ -434,10 +434,6 @@ SOURCE=.\my_thr_init.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\my_vsnprintf.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\my_wincond.c
 # End Source File
 # Begin Source File

VC++Files/mysys/mysys.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/regex/regex.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

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
 
@@ -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
@@ -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"
@@ -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
@@ -464,8 +464,6 @@ SOURCE=.\item_func.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
 
-# ADD CPP /I "../zlib"
-
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"
 
 # ADD CPP /G5 /I "../zlib"
@@ -662,6 +660,10 @@ SOURCE=.\mini_client.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\myisammrg\myrg_rnext_same.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\mysqld.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -779,6 +781,10 @@ SOURCE=.\procedure.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\protocol.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\records.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"

VC++Files/sql/mysqld.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/sql/old/mysqld.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/strings/MASM6x/strings.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/strings/backup/strings.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/strings/noMASM/strings.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-

VC++Files/strings/strings.dsp

@@ -25,7 +25,7 @@ CFG=strings - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "strings - Win32 Release"
@@ -48,7 +48,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\strings.lib"
 
@@ -72,7 +72,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\strings.lib"
 
@@ -104,11 +104,11 @@ SOURCE=.\bmove512.c
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-bin.c"
+SOURCE=".\ctype-big5.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-big5.c"
+SOURCE=".\ctype-bin.c"
 # End Source File
 # Begin Source File
 
@@ -132,6 +132,10 @@ SOURCE=".\ctype-latin1_de.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-mb.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-simple.c"
 # End Source File
 # Begin Source File
@@ -148,39 +152,39 @@ SOURCE=".\ctype-ujis.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\ctype.c
+SOURCE=".\ctype-utf8.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\int2str.c
+SOURCE=".\ctype-win1250ch.c"
 # End Source File
 # Begin Source File
 
-SOURCE=.\llstr.c
+SOURCE=.\ctype.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\longlong2str.c
+SOURCE=.\int2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\r_strinstr.c
+SOURCE=.\llstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\str2int.c
+SOURCE=.\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcend.c
+SOURCE=.\my_vsnprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strend.c
+SOURCE=.\r_strinstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strfill.c
+SOURCE=.\str2int.c
 # End Source File
 # Begin Source File
 
@@ -215,19 +219,6 @@ InputName=Strings
 # End Source File
 # Begin Source File
 
-SOURCE=.\strmake.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strmov.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strnmov.c
-# End Source File
-# Begin Source File
-
-
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
@@ -277,5 +268,9 @@ InputName=Strxmov
 
 SOURCE=.\strxnmov.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\xml.c
+# End Source File
 # End Target
 # End Project

VC++Files/strings/strings.dsw

@@ -26,4 +26,3 @@ Package=<3>
 }}}
 
 ###############################################################################
-