Merge with 4.0, mainly to get changes to windows project files

VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/merge/merge.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/regex/regex.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
include/mysql_embed.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
VC++Files/bdb/bdb.dsp:
  Merge with 4.0
VC++Files/client/mysql.dsp:
  Merge with 4.0
VC++Files/client/mysqlclient.dsp:
  Merge with 4.0
VC++Files/comp_err/comp_err.dsp:
  Merge with 4.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Merge with 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Merge with 4.0
VC++Files/myisamchk/myisamchk.dsp:
  Merge with 4.0
VC++Files/myisamlog/myisamlog.dsp:
  Merge with 4.0
VC++Files/myisampack/myisampack.dsp:
  Merge with 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Merge with 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Merge with 4.0
VC++Files/sql/mysqld.dsp:
  Merge with 4.0
VC++Files/strings/strings.dsp:
  Merge with 4.0
libmysqld/lib_sql.cc:
  Merge with 4.0
libmysqld/libmysqld.def:
  Merge with 4.0
mysql-test/r/func_str.result:
  Merge with 4.0
mysql-test/r/handler.result:
  auto
mysql-test/r/variables.result:
  Merge with 4.0
mysql-test/t/func_str.test:
  auto
mysql-test/t/handler.test:
  auto
mysql-test/t/variables.test:
  Merge with 4.0
scripts/make_win_src_distribution.sh:
  auto
scripts/mysql_install_db.sh:
  Use original file
sql/Makefile.am:
  Merge with 4.0
sql/ha_innodb.cc:
  auto
sql/item_strfunc.cc:
  Merge with 4.0
sql/mysql_priv.h:
  auto
sql/mysqld.cc:
  Merge with 4.0
sql/set_var.cc:
  Merge with 4.0
sql/slave.cc:
  auto
sql/sql_class.h:
  auto
sql/sql_handler.cc:
  Merge with 4.0
strings/ctype-tis620.c:
  Merge with 4.0

1 files changed, 577 insertions, 64 deletions

diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 73c08a8fca0..bd617260ae7 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -7,28 +7,32 @@
 CFG=mysqld - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "mysqld.mak".
-!MESSAGE 
+!MESSAGE
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
+!MESSAGE
 !MESSAGE NMAKE /f "mysqld.mak" CFG="mysqld - Win32 Release"
-!MESSAGE 
+!MESSAGE
 !MESSAGE Possible choices for configuration are:
-!MESSAGE 
+!MESSAGE
 !MESSAGE "mysqld - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 nt" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Max nt" (based on "Win32 (x86) Console Application")
 !MESSAGE "mysqld - Win32 Max" (based on "Win32 (x86) Console Application")
-!MESSAGE 
+!MESSAGE "mysqld - Win32 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - Win32 pro" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - Win32 classic nt" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - Win32 pro nt" (based on "Win32 (x86) Console Application")
+!MESSAGE
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -45,14 +49,14 @@ 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 "../zlib" /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 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
@@ -71,14 +75,14 @@ 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 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
 # SUBTRACT CPP /Fr /YX
 # ADD BASE RSC /l 0x410 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 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
 
@@ -98,14 +102,14 @@ 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" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_NT" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x410 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 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
@@ -126,14 +130,14 @@ 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 "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /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" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_NT_MAX" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 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"
@@ -155,19 +159,132 @@ 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 "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /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" /D "HAVE_DLOPEN" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /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" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_MAX" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 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
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win32_classic"
+# PROP BASE Intermediate_Dir "mysqld___Win32_classic"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "classic"
+# PROP Intermediate_Dir "classic"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D MYSQL_COMMERCIAL_LICENSE /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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\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 BASE LINK32 /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.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_classic/mysqld.exe" /libpath:"..\lib_release"
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win32_pro"
+# PROP BASE Intermediate_Dir "mysqld___Win32_pro"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "pro"
+# PROP Intermediate_Dir "pro"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENCE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /FD /D MYSQL_SERVER_SUFFIX_PRO /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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\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_commercial/mysqld-opt.exe"
+# SUBTRACT BASE LINK32 /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.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_pro/mysqld.exe" /libpath:"..\lib_release"
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win32_classic_nt"
+# PROP BASE Intermediate_Dir "mysqld___Win32_classic_nt"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "classic_nt"
+# PROP Intermediate_Dir "classic_nt"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /D MYSQL_SERVER_SUFFIX_NT /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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\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_classic/mysqld-opt.exe"
+# SUBTRACT BASE LINK32 /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.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_classic/mysqld-nt.exe" /libpath:"..\lib_release"
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win32_pro_nt"
+# PROP BASE Intermediate_Dir "mysqld___Win32_pro_nt"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "pro_nt"
+# PROP Intermediate_Dir "pro_nt"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENCE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /D MYSQL_SERVER_SUFFIX_PRO_NT
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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\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_classic/mysqld-opt.exe"
+# SUBTRACT BASE LINK32 /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.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_pro/mysqld-nt.exe" /libpath:"..\lib_release"
+# SUBTRACT LINK32 /debug
+
+!ENDIF
 
 # Begin Target
 
@@ -176,6 +293,10 @@ LINK32=link.exe
 # Name "mysqld - Win32 nt"
 # Name "mysqld - Win32 Max nt"
 # Name "mysqld - Win32 Max"
+# Name "mysqld - Win32 classic"
+# Name "mysqld - Win32 pro"
+# Name "mysqld - Win32 classic nt"
+# Name "mysqld - Win32 pro nt"
 # Begin Source File
 
 SOURCE=.\client.c
@@ -193,7 +314,15 @@ SOURCE=.\client.c
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -213,7 +342,15 @@ SOURCE=.\derror.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -241,7 +378,15 @@ SOURCE=.\field.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -261,7 +406,15 @@ SOURCE=.\field_conv.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -281,7 +434,15 @@ SOURCE=.\filesort.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -333,7 +494,15 @@ SOURCE=.\handler.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -352,7 +521,15 @@ SOURCE=.\hash_filo.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -375,7 +552,15 @@ SOURCE=.\hostname.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -395,7 +580,15 @@ SOURCE=.\init.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -415,7 +608,15 @@ SOURCE=.\item.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -435,7 +636,15 @@ SOURCE=.\item_buff.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -455,7 +664,15 @@ SOURCE=.\item_cmpfunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -485,6 +702,22 @@ SOURCE=.\item_func.cpp
 
 # ADD CPP /I "../zlib"
 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+# ADD CPP /I "../zlib"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+# ADD CPP /I "../zlib"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+# ADD CPP /I "../zlib"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+# ADD CPP /I "../zlib"
+
 !ENDIF
 
 # End Source File
@@ -513,7 +746,15 @@ SOURCE=.\item_strfunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -537,7 +778,15 @@ SOURCE=.\item_sum.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -556,7 +805,15 @@ SOURCE=.\item_timefunc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -576,7 +833,15 @@ SOURCE=.\item_uniq.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -596,7 +861,15 @@ SOURCE=.\key.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -616,7 +889,15 @@ SOURCE=.\lock.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -636,7 +917,15 @@ SOURCE=.\log.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -659,7 +948,15 @@ SOURCE=.\mf_iocache.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -683,7 +980,15 @@ SOURCE=.\mysqld.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -706,7 +1011,15 @@ SOURCE=.\nt_servc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -729,7 +1042,15 @@ SOURCE=.\opt_range.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -760,7 +1081,15 @@ SOURCE=.\password.c
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -780,7 +1109,15 @@ SOURCE=.\procedure.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -804,7 +1141,15 @@ SOURCE=.\records.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -840,7 +1185,15 @@ SOURCE=.\sql_acl.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -864,7 +1217,15 @@ SOURCE=.\sql_base.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -888,6 +1249,14 @@ SOURCE=.\sql_class.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
 !ENDIF
 
 # End Source File
@@ -920,7 +1289,15 @@ SOURCE=.\sql_db.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -940,7 +1317,15 @@ SOURCE=.\sql_delete.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -980,7 +1365,15 @@ SOURCE=.\sql_insert.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1000,7 +1393,15 @@ SOURCE=.\sql_lex.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1020,7 +1421,15 @@ SOURCE=.\sql_list.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1040,7 +1449,15 @@ SOURCE=.\sql_load.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1064,7 +1481,15 @@ SOURCE=.\sql_map.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1084,7 +1509,15 @@ SOURCE=.\sql_parse.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1116,7 +1549,15 @@ SOURCE=.\sql_select.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1136,7 +1577,15 @@ SOURCE=.\sql_show.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1160,7 +1609,15 @@ SOURCE=.\sql_string.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1180,7 +1637,15 @@ SOURCE=.\sql_table.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1200,7 +1665,15 @@ SOURCE=.\sql_test.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1228,7 +1701,15 @@ SOURCE=.\sql_update.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1248,7 +1729,15 @@ SOURCE=.\sql_yacc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1292,7 +1781,15 @@ SOURCE=.\thr_malloc.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1312,7 +1809,15 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # Begin Source File
@@ -1336,7 +1841,15 @@ SOURCE=.\unireg.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
 
-!ENDIF 
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
+
+!ENDIF
 
 # End Source File
 # End Target