diff --git a/.bzrignore b/.bzrignore
index 302ea948459..d2aa16da0a3 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -103,6 +103,7 @@ Makefile.in'
 PENDING/*
 TAGS
 ac_available_languages_fragment
+acinclude.m4
 aclocal.m4
 analyse.test
 autom4te-2.53.cache/*
@@ -1105,4 +1106,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-acinclude.m4
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 037745bce5f..c5b9e9d7112 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -51,6 +51,7 @@ ejonore@mc03.ndb.mysql.com
 gbichot@quadita2.mysql.com
 georg@beethoven.local
 georg@beethoven.site
+georg@lmy002.wdf.sap.corp
 gerberb@ou800.zenez.com
 gluh@gluh.(none)
 gluh@gluh.mysql.r18.ru
diff --git a/Docs/changelog-4.1.xml b/Docs/changelog-4.1.xml
new file mode 100755
index 00000000000..644f2940d0f
--- /dev/null
+++ b/Docs/changelog-4.1.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!--
+This is a dummy changelog file. Don't use it yet.
+It merges upward without conflict.
+-->
+<appendix id="news-4-1-x">
+
+ <title>
+  Changes in release 4.1.x
+ </title>
+
+ <para>
+  This is a dummy changelog file. Don't use it yet.
+ </para>
+
+</appendix>
diff --git a/VC++Files/client/mysql_ia64.dsp b/VC++Files/client/mysql_ia64.dsp
new file mode 100644
index 00000000000..43bc9fa5b09
--- /dev/null
+++ b/VC++Files/client/mysql_ia64.dsp
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="mysql" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysql - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql.mak" CFG="mysql - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysql - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysql - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysql - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysql - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /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
+# 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:IX86 /machine:IA64
+# ADD LINK32 mysqlclient.lib wsock32.lib 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 /out:"../client_release/mysql.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysql - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysql___"
+# PROP BASE Intermediate_Dir "mysql___"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /nologo /subsystem:console /debug /machine:IA64
+# ADD LINK32 mysqlclient.lib wsock32.lib 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 /incremental:no /debug /out:"../client_debug/mysql.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysql - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysql___WinIA64_classic"
+# PROP BASE Intermediate_Dir "mysql___WinIA64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /WX /Zi /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysql.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 mysqlclient.lib wsock32.lib 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 /out:"../client_classic/mysql.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysql - WinIA64 Release"
+# Name "mysql - WinIA64 Debug"
+# Name "mysql - WinIA64 classic"
+# Begin Source File
+
+SOURCE=.\completion_hash.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysql.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\readline.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_string.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqladmin_ia64.dsp b/VC++Files/client/mysqladmin_ia64.dsp
new file mode 100644
index 00000000000..5a5e4a99071
--- /dev/null
+++ b/VC++Files/client/mysqladmin_ia64.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="mysqladmin" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqladmin - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqladmin_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqladmin_ia64.mak" CFG="mysqladmin - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqladmin - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqladmin - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqladmin - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqladmin - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_release\zlib.lib  mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqladmin.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqladmin - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysqladm"
+# PROP BASE Intermediate_Dir "mysqladm"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 ..\lib_debug\zlib.lib  mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqladmin.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqladmin - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqladmin___Win64_classic"
+# PROP BASE Intermediate_Dir "mysqladmin___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysqladmin.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqladmin.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqladmin - WinIA64 Release"
+# Name "mysqladmin - WinIA64 Debug"
+# Name "mysqladmin - WinIA64 classic"
+# Begin Source File
+
+SOURCE=.\mysqladmin.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqlcheck_ia64.dsp b/VC++Files/client/mysqlcheck_ia64.dsp
new file mode 100644
index 00000000000..4b2c2bb4c46
--- /dev/null
+++ b/VC++Files/client/mysqlcheck_ia64.dsp
@@ -0,0 +1,77 @@
+# Microsoft Developer Studio Project File - Name="mysqlcheck" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlcheck - 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 NMAKE /f "mysqlcheck.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mysqlcheck.mak" CFG="mysqlcheck - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mysqlcheck - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysql - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlcheck___WinIA64_Release"
+# PROP BASE Intermediate_Dir "mysqlcheck___WinIA64_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "mysqlcheck___WinIA64_Release"
+# PROP Intermediate_Dir "mysqlcheck___WinIA64_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo  /MT /W3  /I "../include" /D"NDEBUG" /D"DBUG_OFF" /D"_CONSOLE" /D"_MBCS" /D"_WINDOWS" /Fp"Release/mysqlcheck.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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:IA64
+# ADD LINK32 mysqlclient.lib wsock32.lib 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 /pdb:"release/mysqlcheck.pdb" /machine:IA64 /out:"../client_release/mysqlcheck.exe" /libpath:"..\lib_release\\" /incremental:no
+# SUBTRACT LINK32 
+
+!ENDIF
+
+# Begin Target
+
+# Name "mysqlcheck - WinIA64 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\mysqlcheck.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqlclient_ia64.dsp b/VC++Files/client/mysqlclient_ia64.dsp
new file mode 100644
index 00000000000..e91245c12b2
--- /dev/null
+++ b/VC++Files/client/mysqlclient_ia64.dsp
@@ -0,0 +1,570 @@
+# Microsoft Developer Studio Project File - Name="mysqlclient" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=mysqlclient - WinIA64 authent
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlclient.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlclient.mak" CFG="mysqlclient - WinIA64 authent"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlclient - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqlclient - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqlclient - WinIA64 authent" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlclient - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\mysqlclient.lib"
+
+!ELSEIF  "$(CFG)" == "mysqlclient - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\mysqlclient.lib"
+
+!ELSEIF  "$(CFG)" == "mysqlclient - WinIA64 authent"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlclient___WinIA64_authent"
+# PROP BASE Intermediate_Dir "mysqlclient___WinIA64_authent"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "authent"
+# PROP Intermediate_Dir "authent"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /D "NDEBUG" /D "CHECK_LICENSE" /D LICENSE=Commercial /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\mysqlclient.lib"
+# ADD LIB32 /nologo /out:"..\lib_authent\mysqlclient.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlclient - WinIA64 Release"
+# Name "mysqlclient - WinIA64 Debug"
+# Name "mysqlclient - WinIA64 authent"
+# Begin Source File
+
+SOURCE=..\mysys\array.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bchange.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bmove.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bmove_upp.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\mysys\charset-def.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\charset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\client.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-big5.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-bin.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-czech.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-euc_kr.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-extra.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-gb2312.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-gbk.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-mb.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-simple.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-sjis.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-tis620.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-uca.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-ucs2.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-ujis.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-win1250ch.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\ctype.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dbug\dbug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\default.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\errmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\errors.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\get_password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\int2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\is_prefix.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\libmysql.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\llstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\longlong2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_dirname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_fn_ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_format.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_iocache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_iocache2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_loadpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_path.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_tempfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_unixpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_wcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mulalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_compress.c
+# ADD CPP /I "../zlib"
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_div.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_fopen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_fstream.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_gethostbyname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_getwd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_messnc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_net.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_once.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_pread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_pthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_read.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_realloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_rename.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_seek.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\my_strtoll10.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_symlink.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_symlink2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_tempnam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_thr_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\my_time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\my_vsnprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_wincond.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_winthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_write.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysys_priv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\safemalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\sha1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\str2int.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strfill.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strinstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strmake.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strnlen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strnmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strtoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strtoull.c
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\mysys\typelib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\vio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosocket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viossl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosslfactories.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\xml.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqldump_ia64.dsp b/VC++Files/client/mysqldump_ia64.dsp
new file mode 100644
index 00000000000..698cd0b9c2c
--- /dev/null
+++ b/VC++Files/client/mysqldump_ia64.dsp
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="mysqldump" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqldump - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqldump_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqldump_ia64.mak" CFG="mysqldump - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqldump - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldump - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldump - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqldump - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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 mysys.lib /nologo /subsystem:console  /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqldump - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysqldum"
+# PROP BASE Intermediate_Dir "mysqldum"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 ..\lib_debug\dbug.lib ..\lib_debug\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqldump.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqldump - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqldump___WinIA64_classic"
+# PROP BASE Intermediate_Dir "mysqldump___WinIA64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib /nologo /subsystem:console  /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysys.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqldump - WinIA64 Release"
+# Name "mysqldump - WinIA64 Debug"
+# Name "mysqldump - WinIA64 classic"
+# Begin Source File
+
+SOURCE=.\mysqldump.c
+
+!IF  "$(CFG)" == "mysqldump - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldump - WinIA64 Debug"
+
+# ADD CPP /W3 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX
+
+!ELSEIF  "$(CFG)" == "mysqldump - WinIA64 classic"
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqlimport_ia64.dsp b/VC++Files/client/mysqlimport_ia64.dsp
new file mode 100644
index 00000000000..cd8f5523efd
--- /dev/null
+++ b/VC++Files/client/mysqlimport_ia64.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="mysqlimport" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlimport - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlimport_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlimport_ia64.mak" CFG="mysqlimport - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlimport - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlimport - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlimport - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlimport - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlimport - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysqlimp"
+# PROP BASE Intermediate_Dir "mysqlimp"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 setargv.obj ..\lib_debug\zlib.lib ..\lib_debug\dbug.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqlimport.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlimport - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlimport___WinIA64_classic"
+# PROP BASE Intermediate_Dir "mysqlimport___WinIA64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlimport - WinIA64 Release"
+# Name "mysqlimport - WinIA64 Debug"
+# Name "mysqlimport - WinIA64 classic"
+# Begin Source File
+
+SOURCE=.\mysqlimport.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqlshow_ia64.dsp b/VC++Files/client/mysqlshow_ia64.dsp
new file mode 100644
index 00000000000..dd83a3f1ef5
--- /dev/null
+++ b/VC++Files/client/mysqlshow_ia64.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="mysqlshow" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlshow - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlshow_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlshow_ia64.mak" CFG="mysqlshow - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlshow - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlshow - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlshow - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlshow - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqlshow.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlshow - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysqlsho"
+# PROP BASE Intermediate_Dir "mysqlsho"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 ..\lib_debug\zlib.lib ..\lib_debug\dbug.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqlshow.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlshow - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlshow___WinIA64_classic"
+# PROP BASE Intermediate_Dir "mysqlshow___WinIA64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysqlshow.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqlshow.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlshow - WinIA64 Release"
+# Name "mysqlshow - WinIA64 Debug"
+# Name "mysqlshow - WinIA64 classic"
+# Begin Source File
+
+SOURCE=.\mysqlshow.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/client/mysqltest_ia64.dsp b/VC++Files/client/mysqltest_ia64.dsp
new file mode 100644
index 00000000000..160683725e6
--- /dev/null
+++ b/VC++Files/client/mysqltest_ia64.dsp
@@ -0,0 +1,197 @@
+# Microsoft Developer Studio Project File - Name="mysqltest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=MYSQLTEST - WinIA64 RELEASE
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqltest_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqltest_ia64.mak" CFG="MYSQLTEST - WinIA64 RELEASE"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqltest - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqltest - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqltest - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqltest - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\debug"
+# PROP BASE Intermediate_Dir ".\debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\debug"
+# PROP Intermediate_Dir ".\debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win64
+# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win64
+# ADD BASE CPP /nologo /G6 /MTd /W3 /GX /Z7 /Od /I "../include" /I "../regex" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../regex" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console /debug  /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 ..\lib_debug\zlib.lib ..\lib_debug\dbug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "mysqltest - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\classic"
+# PROP BASE Intermediate_Dir ".\classic"
+# 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 ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win64
+# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win64
+# ADD BASE CPP /nologo /G6 /MT /W3 /GX /Ob1 /Gy /I "../include" /I "../regex" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /GF /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console  /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 ..\lib_release\zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "mysqltest - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\release"
+# PROP BASE Intermediate_Dir ".\release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\release"
+# PROP Intermediate_Dir ".\release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win64
+# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win64
+# ADD BASE CPP /nologo /G6 /MT /W3 /GX /Ob1 /Gy /I "../include" /I "../regex" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /G2 /GF /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console  /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\"
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 ..\lib_release\zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqltest - WinIA64 Debug"
+# Name "mysqltest - WinIA64 classic"
+# Name "mysqltest - WinIA64 Release"
+# Begin Source File
+
+SOURCE=..\libmysql\manager.c
+DEP_CPP_MANAG=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\errmsg.h"\
+	"..\include\m_ctype.h"\
+	"..\include\m_string.h"\
+	"..\include\my_alloc.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_dir.h"\
+	"..\include\my_global.h"\
+	"..\include\my_list.h"\
+	"..\include\my_net.h"\
+	"..\include\my_pthread.h"\
+	"..\include\my_sys.h"\
+	"..\include\mysql.h"\
+	"..\include\mysql_com.h"\
+	"..\include\mysql_time.h"\
+	"..\include\mysql_version.h"\
+	"..\include\mysqld_error.h"\
+	"..\include\mysys_err.h"\
+	"..\include\raid.h"\
+	"..\include\t_ctype.h"\
+	"..\include\typelib.h"\
+	"..\include\violite.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysqltest.c
+DEP_CPP_MYSQL=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\errmsg.h"\
+	"..\include\hash.h"\
+	"..\include\help_end.h"\
+	"..\include\help_start.h"\
+	"..\include\m_ctype.h"\
+	"..\include\m_string.h"\
+	"..\include\my_alloc.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_dir.h"\
+	"..\include\my_getopt.h"\
+	"..\include\my_global.h"\
+	"..\include\my_list.h"\
+	"..\include\my_net.h"\
+	"..\include\my_pthread.h"\
+	"..\include\my_sys.h"\
+	"..\include\mysql.h"\
+	"..\include\mysql_com.h"\
+	"..\include\mysql_embed.h"\
+	"..\include\mysql_time.h"\
+	"..\include\mysql_version.h"\
+	"..\include\mysqld_error.h"\
+	"..\include\raid.h"\
+	"..\include\sslopt-case.h"\
+	"..\include\sslopt-longopts.h"\
+	"..\include\sslopt-vars.h"\
+	"..\include\t_ctype.h"\
+	"..\include\typelib.h"\
+	"..\include\violite.h"\
+	"..\regex\regex.h"\
+	
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/comp_err/comp_err_ia64.dsp b/VC++Files/comp_err/comp_err_ia64.dsp
new file mode 100644
index 00000000000..9d4e8bd5353
--- /dev/null
+++ b/VC++Files/comp_err/comp_err_ia64.dsp
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="comp_err" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=COMP_ERR - WinIA64 DEBUG
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "comp_err_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "comp_err_ia64.mak" CFG="COMP_ERR - WinIA64 DEBUG"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "comp_err - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "comp_err - WinIA64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "comp_err - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\include" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCSN" /D "DBUG_OFF" /D "_WINDOWS" /D "__WIN__" /D "_MT" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr
+RSC=rc.exe
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# 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 ..\lib_release\mysys.lib wsock32.lib ..\lib_release\strings.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib:"LIBC.lib" /out:"../client_release/comp-err.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "comp_err - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Ignore_Export_Lib 0
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\include" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCSN" /D "DBUG_OFF" /D "_WINDOWS" /D "__WIN__" /D "_MT" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr
+MTL=midl.exe
+RSC=rc.exe
+# ADD BASE RSC /l 0x416 /d "_DEBUG"
+# ADD RSC /l 0x416 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# 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 ..\lib_release\mysys.lib wsock32.lib ..\lib_release\strings.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib:"LIBC.lib" /out:"../client_release/comp-err.exe" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "comp_err - WinIA64 Release"
+# Name "comp_err - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=..\extra\comp_err.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/dbug/dbug_ia64.dsp b/VC++Files/dbug/dbug_ia64.dsp
new file mode 100644
index 00000000000..70a32279d20
--- /dev/null
+++ b/VC++Files/dbug/dbug_ia64.dsp
@@ -0,0 +1,125 @@
+# Microsoft Developer Studio Project File - Name="dbug" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=dbug - WinIA64 TLS_DEBUG
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "dbug.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "dbug.mak" CFG="dbug - WinIA64 TLS_DEBUG"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "dbug - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbug - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "dbug - WinIA64 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "dbug - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\dbug.lib"
+
+!ELSEIF  "$(CFG)" == "dbug - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "__WIN64__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\dbug.lib"
+
+!ELSEIF  "$(CFG)" == "dbug - WinIA64 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "dbug___WinIA64_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "dbug___WinIA64_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "dbug___WinIA64_TLS_DEBUG"
+# PROP Intermediate_Dir "dbug___WinIA64_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "__WIN64__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "__WIN64__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_debug\dbug_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_debug\dbug_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "dbug - WinIA64 Release"
+# Name "dbug - WinIA64 Debug"
+# Name "dbug - WinIA64 TLS_DEBUG"
+# Begin Source File
+
+SOURCE=.\dbug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\factorial.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sanity.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/heap/heap_ia64.dsp b/VC++Files/heap/heap_ia64.dsp
new file mode 100644
index 00000000000..6b40b7c34b7
--- /dev/null
+++ b/VC++Files/heap/heap_ia64.dsp
@@ -0,0 +1,256 @@
+# Microsoft Developer Studio Project File - Name="heap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=heap - WinIA64 TLS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "heap.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "heap.mak" CFG="heap - WinIA64 TLS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "heap - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "heap - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "heap - WinIA64 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "heap - WinIA64 TLS" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "heap - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\heap.lib"
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\heap.lib"
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "heap___WinIA64_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "heap___WinIA64_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "heap___WinIA64_TLS_DEBUG"
+# PROP Intermediate_Dir "heap___WinIA64_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "heap___WinIA64_TLS"
+# PROP BASE Intermediate_Dir "heap___WinIA64_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "heap___WinIA64_TLS"
+# PROP Intermediate_Dir "heap___WinIA64_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\heap_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "heap - WinIA64 Release"
+# Name "heap - WinIA64 Debug"
+# Name "heap - WinIA64 TLS_DEBUG"
+# Name "heap - WinIA64 TLS"
+# Begin Source File
+
+SOURCE=.\_check.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_rectest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\heapdef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_block.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_clear.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_close.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_hash.c
+
+!IF  "$(CFG)" == "heap - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 Debug"
+
+# SUBTRACT CPP /YX
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 TLS_DEBUG"
+
+# SUBTRACT BASE CPP /YX
+# SUBTRACT CPP /YX
+
+!ELSEIF  "$(CFG)" == "heap - WinIA64 TLS"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_panic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rename.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rfirst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rlast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rnext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rprev.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rrnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_rsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_scan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hp_write.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/innobase/innobase_ia64.dsp b/VC++Files/innobase/innobase_ia64.dsp
new file mode 100644
index 00000000000..3b42601186a
--- /dev/null
+++ b/VC++Files/innobase/innobase_ia64.dsp
@@ -0,0 +1,450 @@
+# Microsoft Developer Studio Project File - Name="innobase" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=innobase - WinIA64 Max nt
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "innobase.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "innobase.mak" CFG="innobase - WinIA64 Max nt"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "innobase - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "innobase - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "innobase - WinIA64 nt" (based on "Win32 (x86) Static Library")
+!MESSAGE "innobase - WinIA64 Max nt" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "innobase - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "innobase___WinIA64_Debug"
+# PROP BASE Intermediate_Dir "innobase___WinIA64_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# 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 "_WIN64" /D "__NT__" /D "WIN64" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
+# ADD LIB32 /nologo /out:"..\lib_debug\innodb.lib"
+
+!ELSEIF  "$(CFG)" == "innobase - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "innobase___WinIA64_Release0"
+# PROP BASE Intermediate_Dir "innobase___WinIA64_Release0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# 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 "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
+
+!ELSEIF  "$(CFG)" == "innobase - WinIA64 nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "innobase___WinIA64_nt"
+# PROP BASE Intermediate_Dir "innobase___WinIA64_nt"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "nt"
+# PROP Intermediate_Dir "nt"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
+
+!ELSEIF  "$(CFG)" == "innobase - WinIA64 Max nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "innobase___WinIA64_Max_nt"
+# PROP BASE Intermediate_Dir "innobase___WinIA64_Max_nt"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "max_nt"
+# PROP Intermediate_Dir "max_nt"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_Win64" /D "WIN64" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN64" /D "WIN64" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "innobase - WinIA64 Debug"
+# Name "innobase - WinIA64 Release"
+# Name "innobase - WinIA64 nt"
+# Name "innobase - WinIA64 Max nt"
+# Begin Source File
+
+SOURCE=.\btr\btr0btr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\btr\btr0cur.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\btr\btr0pcur.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\btr\btr0sea.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\buf\buf0buf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\buf\buf0flu.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\buf\buf0lru.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\buf\buf0rea.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\data\data0data.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\data\data0type.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict\dict0boot.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict\dict0crea.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict\dict0dict.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict\dict0load.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict\dict0mem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dyn\dyn0dyn.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\eval\eval0eval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\eval\eval0proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fil\fil0fil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fsp\fsp0fsp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fut\fut0fut.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\fut\fut0lst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha\ha0ha.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha\hash0hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ibuf\ibuf0ibuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pars\lexyy.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lock\lock0lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\log\log0log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\log\log0recv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mach\mach0data.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mem\mem0mem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mem\mem0pool.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mtr\mtr0log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mtr\mtr0mtr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\os0file.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\os0proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\os0sync.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\os\os0thread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\page\page0cur.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\page\page0page.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pars\pars0grm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pars\pars0opt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pars\pars0pars.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pars\pars0sym.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\que\que0que.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\read\read0read.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rem\rem0cmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rem\rem0rec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0ins.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0mysql.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0purge.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0row.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0sel.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0uins.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0umod.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0undo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0upd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\row\row0vers.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\srv\srv0que.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\srv\srv0srv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\srv\srv0start.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sync\sync0arr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sync\sync0rw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sync\sync0sync.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr\thr0loc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0purge.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0rec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0roll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0rseg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0sys.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0trx.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trx\trx0undo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\usr\usr0sess.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ut\ut0byte.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ut\ut0dbg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ut\ut0mem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ut\ut0rnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ut\ut0ut.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/isam/isam_ia64.dsp b/VC++Files/isam/isam_ia64.dsp
new file mode 100644
index 00000000000..f9dce0bed4a
--- /dev/null
+++ b/VC++Files/isam/isam_ia64.dsp
@@ -0,0 +1,260 @@
+# Microsoft Developer Studio Project File - Name="isam" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=isam - WinIA64 TLS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "isam.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "isam.mak" CFG="isam - WinIA64 TLS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "isam - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "isam - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "isam - WinIA64 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "isam - WinIA64 TLS" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "isam - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\isam.lib"
+
+!ELSEIF  "$(CFG)" == "isam - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_Debug\isam.lib"
+
+!ELSEIF  "$(CFG)" == "isam - WinIA64 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "isam___WinIA64_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "isam___WinIA64_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "isam___WinIA64_TLS_DEBUG"
+# PROP Intermediate_Dir "isam___WinIA64_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_Debug\isam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_Debug\isam_tls.lib"
+
+!ELSEIF  "$(CFG)" == "isam - WinIA64 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "isam___WinIA64_TLS"
+# PROP BASE Intermediate_Dir "isam___WinIA64_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "isam___WinIA64_TLS"
+# PROP Intermediate_Dir "isam___WinIA64_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\isam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\isam_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "isam - WinIA64 Release"
+# Name "isam - WinIA64 Debug"
+# Name "isam - WinIA64 TLS_DEBUG"
+# Name "isam - WinIA64 TLS"
+# Begin Source File
+
+SOURCE=.\_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_dbug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_dynrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_key.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_locking.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_packrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_page.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_search.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\_statrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\changed.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\close.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\panic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\range.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rfirst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rlast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rnext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rprev.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rrnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rsamepos.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\write.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/isamchk/isamchk_ia64.dsp b/VC++Files/isamchk/isamchk_ia64.dsp
new file mode 100644
index 00000000000..61eab230e1f
--- /dev/null
+++ b/VC++Files/isamchk/isamchk_ia64.dsp
@@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="isamchk" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=isamchk - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "isamchk_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "isamchk_ia64.mak" CFG="isamchk - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "isamchk - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "isamchk - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "isamchk - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x41d /d "NDEBUG"
+# ADD RSC /l 0x41d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console  /machine:IA64
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console  /out:"../client_release/isamchk.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "isamchk - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "isamchk___WinIA64_classic"
+# PROP BASE Intermediate_Dir "isamchk___WinIA64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D LICENSE=Commercial /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x41d /d "NDEBUG"
+# ADD RSC /l 0x41d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console  /out:"../client_release/isamchk.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/isamchk.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "isamchk - WinIA64 Release"
+# Name "isamchk - WinIA64 classic"
+# Begin Source File
+
+SOURCE=..\isam\isamchk.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\isam\sort.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/libmysql/libmysql_ia64.dsp b/VC++Files/libmysql/libmysql_ia64.dsp
new file mode 100644
index 00000000000..4c4776dfc2f
--- /dev/null
+++ b/VC++Files/libmysql/libmysql_ia64.dsp
@@ -0,0 +1,544 @@
+# Microsoft Developer Studio Project File - Name="libmysql" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libmysql - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libmysql_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libmysql_ia64.mak" CFG="libmysql - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libmysql - WinIA64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libmysql - WinIA64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libmysql - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "." /I "..\include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "NDEBUG" /D "MYSQL_CLIENT" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win64
+# 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
+# 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:windows /dll  /machine:IA64
+# ADD LINK32 zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:windows /dll  /def:"libmysql.def" /out:"..\lib_release\libmysql.dll" /libpath:"." /libpath:"..\lib_release" /machine:IA64
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Move DLL export lib
+PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /y
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libmysql - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "." /I "..\include" /I "../zlib" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win64
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win64
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug  /machine:IA64
+# ADD LINK32 zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:windows /dll /incremental:no /map /debug  /def:"libmysql.def" /out:"..\lib_debug\libmysql.dll" /libpath:"." /libpath:"..\lib_debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Move DLL export lib
+PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll %windir%\system32\ /y	xcopy     debug\libmysql.lib ..\lib_debug\ /y
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libmysql - WinIA64 Release"
+# Name "libmysql - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=..\mysys\array.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bchange.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bmove.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\bmove_upp.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\mysys\charset-def.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\charset.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\client.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-big5.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-bin.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-czech.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-euc_kr.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-extra.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-gb2312.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-gbk.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-mb.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-simple.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-sjis.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-tis620.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-uca.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-ucs2.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-ujis.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-win1250ch.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\ctype.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\dbug\dbug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\default.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\errmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\errors.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\get_password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\int2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\is_prefix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libmysql.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\Libmysql.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\llstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\longlong2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_dirname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_fn_ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_format.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_loadpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_path.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_unixpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mf_wcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\mulalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_div.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_fopen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_fstream.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_gethostbyname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_getwd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_messnc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_net.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_once.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_pthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_read.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_realloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_rename.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\my_strtoll10.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_symlink.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_symlink2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_tempnam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_thr_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\my_vsnprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_wincond.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_winthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_write.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\client\mysys_priv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\safemalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\sha1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\client\sql_string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\client\sql_string.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\str2int.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strfill.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strinstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strmake.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strnlen.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strnmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strtoll.c
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\mysys\typelib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\vio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosocket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viossl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosslfactories.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\xml.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp b/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
new file mode 100644
index 00000000000..049b214e5ff
--- /dev/null
+++ b/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
@@ -0,0 +1,79 @@
+# Microsoft Developer Studio Project File - Name="test_libmysqld" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test_libmysqld - WinIA64 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test_libmysqld_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test_libmysqld_ia64.mak" CFG="test_libmysqld - WinIA64 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test_libmysqld - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "..\..\include" /I "../include" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "DBUG_OFF" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# 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 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 bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib:"LIBCMTD" /out:"Release/mysql-server.exe" /machine:IA64
+# Begin Target
+
+# Name "test_libmysqld - WinIA64 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\client\completion_hash.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\client\mysql.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\client\readline.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\client\sql_string.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\lib_release\libmysqld.lib
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/libmysqld/libmysqld_ia64.dsp b/VC++Files/libmysqld/libmysqld_ia64.dsp
new file mode 100644
index 00000000000..fe99ea480c7
--- /dev/null
+++ b/VC++Files/libmysqld/libmysqld_ia64.dsp
@@ -0,0 +1,580 @@
+# Microsoft Developer Studio Project File - Name="libmysqld" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libmysqld - WinIA64 pro
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libmysqld_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libmysqld_ia64.mak" CFG="libmysqld - WinIA64 pro"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libmysqld - WinIA64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libmysqld - WinIA64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libmysqld - WinIA64 classic" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libmysqld - WinIA64 pro" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libmysqld - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../zlib" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll  /machine:IA64
+# ADD LINK32 ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib 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 bufferoverflowU.lib /nologo /dll  /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "libmysqld - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "libmysqld___Win64_Debug"
+# PROP BASE Intermediate_Dir "libmysqld___Win64_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MT /W3 /Zi /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../zlib" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "SAFEMALLOC" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x416 /d "_DEBUG"
+# ADD RSC /l 0x416 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug  /machine:IA64
+# ADD LINK32 ..\lib_debug\dbug_tls.lib ..\lib_debug\myisam_tls.lib ..\lib_debug\myisammrg_tls.lib ..\lib_debug\mysys_tls.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap_tls.lib ..\lib_debug\innodb.lib ../lib_debug\zlib.lib bufferoverflowU.lib 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 /nologo /dll /incremental:no /debug  /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "libmysqld - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "libmysqld___Win64_classic"
+# PROP BASE Intermediate_Dir "libmysqld___Win64_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 "../sql" /D "WIN64" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN64" /D "_WINDOWS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\zlib.lib /nologo /dll  /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64
+# ADD LINK32 ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\zlib.lib 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 bufferoverflowU.lib /nologo /dll  /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "libmysqld - WinIA64 pro"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "libmysqld___Win64_pro"
+# PROP BASE Intermediate_Dir "libmysqld___Win64_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 "../sql" /D "WIN64" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN64" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-pro /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /X /Fr
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /dll  /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64
+# ADD LINK32 ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib 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 bufferoverflowU.lib /nologo /dll  /out:"../lib_pro/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libmysqld - WinIA64 Release"
+# Name "libmysqld - WinIA64 Debug"
+# Name "libmysqld - WinIA64 classic"
+# Name "libmysqld - WinIA64 pro"
+# Begin Source File
+
+SOURCE="..\sql-common\client.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\default.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\derror.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\discover.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\emb_qcache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\errmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\field.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\field_conv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\filesort.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\client\get_password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\gstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_berkeley.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_heap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_innodb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_isammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_myisam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_myisammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\hash_filo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\hostname.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\init.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\int2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_buff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_cmpfunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_create.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_func.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_geofunc.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
+
+SOURCE=..\sql\item_timefunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_uniq.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\key.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\lib_sql.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\libmysql.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libmysqld.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libmysqld.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\lock.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\log.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\log_event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\mf_iocache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\sql-common\my_time.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\opt_range.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\opt_sum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE="..\sql-common\pack.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\password.c
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\sql\repl_failsafe.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\set_var.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\spatial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_acl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_analyse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_cache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_class.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_crypt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_db.cpp
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\sql\sql_help.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_insert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_lex.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_load.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_map.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_parse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_prepare.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_rename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_repl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_select.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_show.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_state.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_udf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_union.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_update.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_yacc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\str2int.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strcont.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\strfunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strinstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\strxnmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\thr_malloc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\time.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\tztime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\uniques.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\unireg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\vio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosocket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viossl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\vio\viosslfactories.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/libmysqltest/myTest-package_ia64.dsp b/VC++Files/libmysqltest/myTest-package_ia64.dsp
new file mode 100644
index 00000000000..ef80a773815
--- /dev/null
+++ b/VC++Files/libmysqltest/myTest-package_ia64.dsp
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="myTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "myTest.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "myTest.mak" CFG="myTest - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "myTest - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myTest - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myTest - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo  /W3  /I "..\include" /D"NDEBUG" /D"DBUG_UFF" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# 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  /nologo /subsystem:console /machine:IA64
+# ADD LINK32 ..\lib_release\libmysql.lib 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:IA64 /libpath:"..\lib_release" /incremental:no
+
+!ELSEIF  "$(CFG)" == "myTest - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo  /MTd /W3 /Z7  /I "..\include" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+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  /nologo /subsystem:console /debug /machine:IA64 
+# ADD LINK32 ..\lib_debug\libmysql.lib 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:IA64 /libpath:"..\lib_debug" /incremental:no
+
+!ENDIF
+
+# Begin Target
+
+# Name "myTest - WinIA64 Release"
+# Name "myTest - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\Mytest.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/libmysqltest/myTest_ia64.dsp b/VC++Files/libmysqltest/myTest_ia64.dsp
new file mode 100644
index 00000000000..4affa81ef54
--- /dev/null
+++ b/VC++Files/libmysqltest/myTest_ia64.dsp
@@ -0,0 +1,94 @@
+# Microsoft Developer Studio Project File - Name="myTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myTest - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myTest_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myTest_ia64.mak" CFG="myTest - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myTest - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myTest - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myTest - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /I "..\include" /D "DBUG_UFF" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /libpath:"..\lib_release" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myTest - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /libpath:"..\lib_debug" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myTest - WinIA64 Release"
+# Name "myTest - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\Mytest.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/merge/merge_ia64.dsp b/VC++Files/merge/merge_ia64.dsp
new file mode 100644
index 00000000000..7b93f596997
--- /dev/null
+++ b/VC++Files/merge/merge_ia64.dsp
@@ -0,0 +1,134 @@
+# Microsoft Developer Studio Project File - Name="merge" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=merge - WinIA64  Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "merge.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "merge.mak" CFG="merge - WinIA64  Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "merge - WinIA64  Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "merge - WinIA64  Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "merge - WinIA64  Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\merge.lib"
+
+!ELSEIF  "$(CFG)" == "merge - WinIA64  Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WinIA64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\merge.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "merge - WinIA64  Release"
+# Name "merge - WinIA64  Debug"
+# Begin Source File
+
+SOURCE=.\mrg_close.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_locking.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_panic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_rrnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_rsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mrg_update.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp b/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
new file mode 100644
index 00000000000..9fefa5c927e
--- /dev/null
+++ b/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
@@ -0,0 +1,133 @@
+# Microsoft Developer Studio Project File - Name="my_print_defaults" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=my_print_defaults - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "my_print_defaults_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "my_print_defaults_ia64.mak" CFG="my_print_defaults - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "my_print_defaults - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "my_print_defaults - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "my_print_defaults - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "my_print_defaults - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "WIN64" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/my_print_defaults.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "my_print_defaults - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /RTC1 /c
+# ADD CPP /nologo /MT /W3 /Zi /Od /I "../include" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "_DEBUG"
+# ADD RSC /l 0x416 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\dbug.lib 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 bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /nodefaultlib:"LIBCMTD.lib" /out:"../client_debug/my_print_defaults.exe" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "my_print_defaults - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "my_print_defaults___Win64_classic"
+# PROP BASE Intermediate_Dir "my_print_defaults___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN64" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "WIN64" /D "_CONSOLE" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 /nologo /subsystem:console  /out:"../client_release/my_print_defaults.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/my_print_defaults.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "my_print_defaults - WinIA64 Release"
+# Name "my_print_defaults - WinIA64 Debug"
+# Name "my_print_defaults - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\extra\my_print_defaults.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisam/myisam_ia64.dsp b/VC++Files/myisam/myisam_ia64.dsp
new file mode 100644
index 00000000000..3602eb87c20
--- /dev/null
+++ b/VC++Files/myisam/myisam_ia64.dsp
@@ -0,0 +1,366 @@
+# Microsoft Developer Studio Project File - Name="myisam" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=myisam - WinIA64 TLS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisam.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisam.mak" CFG="myisam - WinIA64 TLS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisam - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisam - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisam - WinIA64 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisam - WinIA64 TLS" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisam - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\myisam.lib"
+
+!ELSEIF  "$(CFG)" == "myisam - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32  /nologo
+# ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib"
+
+!ELSEIF  "$(CFG)" == "myisam - WinIA64 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "myisam___Win64_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "myisam___Win64_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "myisam___Win64_TLS_DEBUG"
+# PROP Intermediate_Dir "myisam___Win64_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32  /nologo /out:"..\lib_Debug\myisam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
+
+!ELSEIF  "$(CFG)" == "myisam - WinIA64 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisam___Win64_TLS"
+# PROP BASE Intermediate_Dir "myisam___Win64_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "myisam___Win64_TLS"
+# PROP Intermediate_Dir "myisam___Win64_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32  /nologo /out:"..\lib_release\myisam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisam - WinIA64 Release"
+# Name "myisam - WinIA64 Debug"
+# Name "myisam - WinIA64 TLS_DEBUG"
+# Name "myisam - WinIA64 TLS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ft_boolean_search.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_nlq_search.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_stem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_stopwords.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ft_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_changed.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_check.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_checksum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_close.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_dbug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_delete_all.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_delete_table.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_dynrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_key.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_keycache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_locking.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_packrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_page.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_panic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_preload.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_range.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rename.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rfirst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rlast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rnext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rnext_same.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rprev.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rrnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_rsamepos.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_scan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_search.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_statrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_unique.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mi_write.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_index.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_key.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_mbr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_split.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sp_key.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\ft_eval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\myisamdef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\rt_index.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp b/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
new file mode 100644
index 00000000000..175561c6c05
--- /dev/null
+++ b/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
@@ -0,0 +1,105 @@
+# Microsoft Developer Studio Project File - Name="myisam_ftdump" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myisam_ftdump - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisam_ftdump_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisam_ftdump_ia64.mak" CFG="myisam_ftdump - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisam_ftdump - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisam_ftdump - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisam_ftdump - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib kernel32.lib user32.lib wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/myisam_ftdump.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myisam_ftdump - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../myisam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ole32.lib oleaut32.lib odbc32.lib odbccp32.lib ..\lib_debug\myisam.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\dbug.lib  ..\lib_debug\zlib.lib kernel32.lib user32.lib wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/myisam_ftdump.exe" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisam_ftdump - WinIA64 Release"
+# Name "myisam_ftdump - WinIA64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\myisam\myisam_ftdump.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisamchk/myisamchk_ia64.dsp b/VC++Files/myisamchk/myisamchk_ia64.dsp
new file mode 100644
index 00000000000..d6b1d5825ee
--- /dev/null
+++ b/VC++Files/myisamchk/myisamchk_ia64.dsp
@@ -0,0 +1,136 @@
+# Microsoft Developer Studio Project File - Name="myisamchk" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myisamchk - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisamchk_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisamchk_ia64.mak" CFG="myisamchk - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisamchk - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisamchk - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisamchk - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisamchk - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /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
+# 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 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:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/myisamchk.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myisamchk - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../myisam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\dbug.lib ..\lib_debug\myisam.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\zlib.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/myisamchk.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myisamchk - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisamchk___Win64_classic"
+# PROP BASE Intermediate_Dir "myisamchk___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console  /out:"../client_release/myisamchk.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/myisamchk.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisamchk - WinIA64 Release"
+# Name "myisamchk - WinIA64 Debug"
+# Name "myisamchk - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\myisam\myisamchk.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisamlog/myisamlog_ia64.dsp b/VC++Files/myisamlog/myisamlog_ia64.dsp
new file mode 100644
index 00000000000..dc830eaf314
--- /dev/null
+++ b/VC++Files/myisamlog/myisamlog_ia64.dsp
@@ -0,0 +1,138 @@
+# Microsoft Developer Studio Project File - Name="myisamlog" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myisamlog - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisamlog_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisamlog_ia64.mak" CFG="myisamlog - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisamlog - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisamlog - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisamlog - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisamlog - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr
+# 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
+# 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 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:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /pdb:"release/myisamchk.pdb"  /out:"../client_release/myisamlog.exe" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "myisamlog - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../myisam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\myisam.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\zlib.lib ..\lib_debug\dbug.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no /pdb:"debug/myisamchk.pdb" /debug  /out:"../client_debug/myisamlog.exe" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "myisamlog - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisamlog___Win64_classic"
+# PROP BASE Intermediate_Dir "myisamlog___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /pdb:"release/myisamchk.pdb"  /out:"../client_release/myisamlog.exe" /machine:IA64
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /pdb:"release/myisamchk.pdb"  /out:"../client_classic/myisamlog.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisamlog - WinIA64 Release"
+# Name "myisamlog - WinIA64 Debug"
+# Name "myisamlog - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\myisam\myisamlog.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisammrg/myisammrg_ia64.dsp b/VC++Files/myisammrg/myisammrg_ia64.dsp
new file mode 100644
index 00000000000..4ac6a1e8081
--- /dev/null
+++ b/VC++Files/myisammrg/myisammrg_ia64.dsp
@@ -0,0 +1,233 @@
+# Microsoft Developer Studio Project File - Name="myisammrg" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=myisammrg - WinIA64  TLS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisammrg.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisammrg.mak" CFG="myisammrg - WinIA64  TLS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisammrg - WinIA64  Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisammrg - WinIA64  Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisammrg - WinIA64  TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisammrg - WinIA64  TLS" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisammrg - WinIA64  Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\myisammrg.lib"
+
+!ELSEIF  "$(CFG)" == "myisammrg - WinIA64  Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WinIA64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg.lib"
+
+!ELSEIF  "$(CFG)" == "myisammrg - WinIA64  TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "myisammrg___WinIA64 _TLS_DEBUG"
+# PROP BASE Intermediate_Dir "myisammrg___WinIA64 _TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "myisammrg___WinIA64 _TLS_DEBUG"
+# PROP Intermediate_Dir "myisammrg___WinIA64 _TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
+# SUBTRACT BASE CPP /Fr
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /Fo".\Debug/" /Fd".\Debug/" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_Debug\myisammrg_tls.lib"
+
+!ELSEIF  "$(CFG)" == "myisammrg - WinIA64  TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisammrg___WinIA64 _TLS"
+# PROP BASE Intermediate_Dir "myisammrg___WinIA64 _TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "myisammrg___WinIA64 _TLS"
+# PROP Intermediate_Dir "myisammrg___WinIA64 _TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\myisammrg_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisammrg - WinIA64  Release"
+# Name "myisammrg - WinIA64  Debug"
+# Name "myisammrg - WinIA64  TLS_DEBUG"
+# Name "myisammrg - WinIA64  TLS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\myrg_close.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_extra.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_locking.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_panic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_queue.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_range.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rfirst.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rkey.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rlast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rnext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rnext_same.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rprev.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rrnd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_rsame.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\myrg_write.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\mymrgdef.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/myisampack/myisampack_ia64.dsp b/VC++Files/myisampack/myisampack_ia64.dsp
new file mode 100644
index 00000000000..8a2045faa22
--- /dev/null
+++ b/VC++Files/myisampack/myisampack_ia64.dsp
@@ -0,0 +1,138 @@
+# Microsoft Developer Studio Project File - Name="myisampack" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=myisampack - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "myisampack_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "myisampack_ia64.mak" CFG="myisampack - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "myisampack - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisampack - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "myisampack - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myisampack - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr
+# 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
+# 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 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:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/myisampack.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myisampack - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../myisam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\myisam.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\zlib.lib ..\lib_debug\dbug.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/myisampack.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "myisampack - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisampack___Win64_classic"
+# PROP BASE Intermediate_Dir "myisampack___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console  /out:"../client_release/myisampack.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/myisampack.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "myisampack - WinIA64 Release"
+# Name "myisampack - WinIA64 Debug"
+# Name "myisampack - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\myisam\myisampack.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\myisampack.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
new file mode 100644
index 00000000000..a6252d0cb7b
--- /dev/null
+++ b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
@@ -0,0 +1,142 @@
+# Microsoft Developer Studio Project File - Name="mysql_test_run_new" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysql_test_run_new - WinIA64 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql_test_run_new_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql_test_run_new_ia64.mak" CFG="mysql_test_run_new - WinIA64 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysql_test_run_new - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysql_test_run_new - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysql_test_run_new - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Debug"
+# PROP BASE Intermediate_Dir ".\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\Debug"
+# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /WinIA64
+# ADD MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /WinIA64
+# ADD BASE CPP /nologo /G6 /MTd /W3 /GX /Z7 /Od /I "../include" /I "../" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN64" /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN64" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /GZ /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /map /debug  /out:"..\mysql-test\mysql_test_run_new.exe" /machine:IA64
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /map /debug  /out:"..\mysql-test\mysql_test_run_new.exe" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "mysql_test_run_new - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /WinIA64
+# ADD MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /WinIA64
+# ADD BASE CPP /nologo /G6 /MTd /W3 /GX /Ob1 /Gy /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN64" /GF /c
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN64" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /GF /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\mysql-test\mysql_test_run_new.exe" /machine:IA64
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 t kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"..\mysql-test\mysql_test_run_new.exe" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysql_test_run_new - WinIA64 Debug"
+# Name "mysql_test_run_new - WinIA64 Release"
+# Begin Source File
+
+SOURCE=.\my_create_tables.c
+DEP_CPP_MY_CR=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\m_string.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_global.h"\
+	".\my_manage.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_manage.c
+DEP_CPP_MY_MA=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\m_string.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_global.h"\
+	".\my_manage.h"\
+	
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_manage.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysql_test_run_new.c
+DEP_CPP_MYSQL=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\m_string.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_global.h"\
+	".\my_manage.h"\
+	
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/mysql_ia64.dsw b/VC++Files/mysql_ia64.dsw
new file mode 100644
index 00000000000..8af4a7e5c42
--- /dev/null
+++ b/VC++Files/mysql_ia64.dsw
@@ -0,0 +1,783 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "mysys"=".\mysys\mysys_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+
+###############################################################################
+
+Project: "strings"=".\strings\strings_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "vio"=".\vio\vio_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "regex"=".\regex\regex_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=".\zlib\zlib_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "comp_err"=".\comp_err\comp_err_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "dbug"=".\dbug\dbug_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "mysqlclient"=".\client\mysqlclient_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "myisam"=".\myisam\myisam_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "myisammrg"=".\myisammrg\myisammrg_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "myisampack"=".\myisampack\myisampack_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "heap"=".\heap\heap_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "innobase"=".\innobase\innobase_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "isam"=".\isam\isam_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "isamchk"=".\isamchk\isamchk_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name isam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libmysql"=".\libmysql\libmysql_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libmysqld"=".\libmysqld\libmysqld_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name heap
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name innobase
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name regex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisammrg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "merge"=".\merge\merge_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "myTest"=".\libmysqltest\myTest_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libmysql
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "my_print_defaults"=".\my_print_defaults\my_print_defaults_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "myisam_ftdump"=".\myisam_ftdump\myisam_ftdump_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "myisamchk"=".\myisamchk\myisamchk_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "myisamlog"=".\myisamlog\myisamlog_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysql"=".\client\mysql_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqladmin"=".\client\mysqladmin_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlbinlog"=".\mysqlbinlog\mysqlbinlog_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlcheck"=".\mysqlcheck\mysqlcheck_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqld"=".\sql\mysqld_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name heap
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name isam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name merge
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name regex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name dbug_ia64
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysql_ia64
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysqladmin_ia64
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysqldump
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysqlimport
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name MySqlManager
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysqlshow
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myTest
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name thr_test
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name replace
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisammrg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name vio
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name innobase
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqldemb"=".\mysqldemb\mysqldemb_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "mysqldump"=".\client\mysqldump_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlimport"=".\client\mysqlimport_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlserver"=".\mysqlserver\mysqlserver_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name heap
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name innobase
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name merge
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name myisammrg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysqldemb
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name regex
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlshow"=".\client\mysqlshow_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name mysqlclient
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mysqlshutdown"=".\mysqlshutdown\mysqlshutdown_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "mysqlwatch"=".\mysqlwatch\mysqlwatch_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "pack_isam"=".\pack_isam\pack_isam_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name isam
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "perror"=".\perror\perror_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "replace"=".\replace\replace_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test1"=".\test1\test1_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libmysql
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "thr_test"=".\thr_test\thr_test_ia64.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name dbug
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mysys
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name strings
+    End Project Dependency
+}}}
+
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
diff --git a/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp b/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
new file mode 100644
index 00000000000..334c5087365
--- /dev/null
+++ b/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="mysqlbinlog" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlbinlog - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlbinlog_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlbinlog_ia64.mak" CFG="mysqlbinlog - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlbinlog - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlbinlog - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlbinlog - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlbinlog - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "eelease"
+# PROP Intermediate_Dir "eelease"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /I "../sql" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_release\zlib.lib  mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqlbinlog - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /I "../sql" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\zlib.lib  mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqlbinlog.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlbinlog - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlbinlog___Win64_classic"
+# PROP BASE Intermediate_Dir "mysqlbinlog___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /I "../sql" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlbinlog - WinIA64 Release"
+# Name "mysqlbinlog - WinIA64 Debug"
+# Name "mysqlbinlog - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\mysys\mf_tempdir.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\client\mysqlbinlog.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp b/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
new file mode 100644
index 00000000000..1f1cf76276f
--- /dev/null
+++ b/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
@@ -0,0 +1,132 @@
+# Microsoft Developer Studio Project File - Name="mysqlcheck" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlcheck - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlcheck_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlcheck_ia64.mak" CFG="mysqlcheck - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlcheck - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlcheck - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqlcheck - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlcheck - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqlcheck.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlcheck - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqlcheck.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlcheck - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlcheck___Win64_classic"
+# PROP BASE Intermediate_Dir "mysqlcheck___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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  /out:"../client_release/mysqlcheck.exe" /libpath:"..\lib_release\\" /machine:IA64
+# ADD LINK32 ..\lib_release\zlib.lib mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqlcheck.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlcheck - WinIA64 Release"
+# Name "mysqlcheck - WinIA64 Debug"
+# Name "mysqlcheck - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\client\mysqlcheck.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysqldemb/mysqldemb_ia64.dsp b/VC++Files/mysqldemb/mysqldemb_ia64.dsp
new file mode 100644
index 00000000000..5b54a7756e1
--- /dev/null
+++ b/VC++Files/mysqldemb/mysqldemb_ia64.dsp
@@ -0,0 +1,447 @@
+# Microsoft Developer Studio Project File - Name="mysqldemb" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=mysqldemb - WinIA64  pro
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqldemb.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqldemb.mak" CFG="mysqldemb - WinIA64  pro"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqldemb - WinIA64  Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqldemb - WinIA64  Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqldemb - WinIA64  classic" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqldemb - WinIA64  pro" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqldemb - WinIA64  Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../bdb/build_WinIA64" /I "../zlib" /D "WinIA64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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__" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "mysqldemb - WinIA64  Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WinIA64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../zlib" /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../bdb/build_WinIA64" /D "WinIA64" /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__" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GZ /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"../lib_debug/mysqldemb.lib"
+
+!ELSEIF  "$(CFG)" == "mysqldemb - WinIA64  classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqldemb___WinIA64 _classic"
+# PROP BASE Intermediate_Dir "mysqldemb___WinIA64 _classic"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "classic"
+# PROP Intermediate_Dir "classic"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WinIA64" /D "_MBCS" /D "_LIB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WinIA64" /D "_LIB" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "MYSQL_SERVER" /D "USE_TLS" /D "__WIN__" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_classic\mysqldemb.lib"
+
+!ELSEIF  "$(CFG)" == "mysqldemb - WinIA64  pro"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqldemb___WinIA64 _pro"
+# PROP BASE Intermediate_Dir "mysqldemb___WinIA64 _pro"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "pro"
+# PROP Intermediate_Dir "pro"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WinIA64" /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__" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WinIA64" /D "_LIB" /D "SIGNAL_WITH_VIO_CLOSE" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D "USE_SYMDIR" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-pro /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_pro\mysqldemb.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqldemb - WinIA64  Release"
+# Name "mysqldemb - WinIA64  Debug"
+# Name "mysqldemb - WinIA64  classic"
+# Name "mysqldemb - WinIA64  pro"
+# Begin Source File
+
+SOURCE=..\sql\derror.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\errmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\field.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\field_conv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\filesort.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\get_password.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_heap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_innodb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_isammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_myisam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\ha_myisammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\hash_filo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\hostname.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\init.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_buff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_cmpfunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_create.cpp
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\sql\item_timefunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\item_uniq.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\key.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysqld\lib_sql.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysqld\libmysqld.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\lock.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\log.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\log_event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\mf_iocache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\opt_range.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\opt_sum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\password.c
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\sql\repl_failsafe.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\slave.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_acl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_analyse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_base.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_cache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_class.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_crypt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_db.cpp
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\sql\sql_insert.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_lex.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_list.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_map.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_parse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_prepare.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_rename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_repl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_select.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_show.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_udf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_union.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_update.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_yacc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\thr_malloc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\time.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\uniques.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\unireg.cpp
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/mysqlmanager/MySqlManager_ia64.dsp b/VC++Files/mysqlmanager/MySqlManager_ia64.dsp
new file mode 100644
index 00000000000..b0ffc9e48c6
--- /dev/null
+++ b/VC++Files/mysqlmanager/MySqlManager_ia64.dsp
@@ -0,0 +1,276 @@
+# Microsoft Developer Studio Project File - Name="MySqlManager" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=MYSQLMANAGER - WinIA64 DEBUG
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "MySqlManager.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "MySqlManager.mak" CFG="MYSQLMANAGER - WinIA64 DEBUG"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "MySqlManager - WinIA64 Release" (based on "Win32 (x86) Application")
+!MESSAGE "MySqlManager - WinIA64 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "MySqlManager - WinIA64 Release"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win64
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows  /machine:IA64
+# ADD LINK32  /nologo /subsystem:windows  /out:"../client_release/MySqlManager.exe" /machine:IA64
+# SUBTRACT LINK32 /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "MySqlManager - WinIA64 Debug"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MTd /W3 /GR /Zi /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win64
+# ADD MTL /nologo /D "_DEBUG" /o "NUL" /win64
+# SUBTRACT MTL /mktyplib203
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:windows /debug  /machine:IA64
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib /nologo /subsystem:windows /incremental:no /debug  /out:"../client_debug/MySqlManager.exe" /libpath:"..\lib_debug\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "MySqlManager - WinIA64 Release"
+# Name "MySqlManager - WinIA64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\ChildFrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-extra.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\strings\ctype-mb.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\is_prefix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\MainFrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\mysys\my_sleep.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strings\my_vsnprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManager.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManagerDoc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManagerView.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\RegisterServer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSql.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlQuery.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlResults.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlStatus.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\ChildFrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MainFrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManagerDoc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\MySqlManagerView.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\RegisterServer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlQuery.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlResults.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ToolSqlStatus.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\res\bitmap1.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\bitmap3.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\bmp00001.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\bmp00002.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\database.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\fontd.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\fontu.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\MySqlManager.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\MySqlManager.rc2
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\MySqlManagerDoc.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\query_ex.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\Toolbar.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/mysqlserver/mysqlserver_ia64.dsp b/VC++Files/mysqlserver/mysqlserver_ia64.dsp
new file mode 100644
index 00000000000..205a1d1407d
--- /dev/null
+++ b/VC++Files/mysqlserver/mysqlserver_ia64.dsp
@@ -0,0 +1,84 @@
+# Microsoft Developer Studio Project File - Name="mysqlserver" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=mysqlserver - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlserver.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlserver.mak" CFG="mysqlserver - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlserver - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysqlserver - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlserver - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win64" /I "../libmysqld" /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /YX /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x416 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "mysqlserver - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win64" /I "libmysqld" /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /YX /FD /GZ /G2 /EHsc /Wp64 /Zm600 /c
+# 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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlserver - WinIA64 Release"
+# Name "mysqlserver - WinIA64 Debug"
+# End Target
+# End Project
diff --git a/VC++Files/mysqlshutdown/myshutdown_ia64.dsp b/VC++Files/mysqlshutdown/myshutdown_ia64.dsp
new file mode 100644
index 00000000000..1cee7987d5e
--- /dev/null
+++ b/VC++Files/mysqlshutdown/myshutdown_ia64.dsp
@@ -0,0 +1,101 @@
+# Microsoft Developer Studio Project File - Name="myshutdown" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=myshutdown - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "myshutdown.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "myshutdown.mak" CFG="myshutdown - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "myshutdown - WinIA64 Release" (based on "Win32 (x86) Application")
+!MESSAGE "myshutdown - WinIA64 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "myshutdown - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3   /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /YX /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# 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
+# 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:windows /machine:IA64
+# 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  /nologo /subsystem:windows /machine:IA64 /incremental:no
+
+!ELSEIF  "$(CFG)" == "myshutdown - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm    /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /YX /FD /GZ /c /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /nologo /subsystem:windows /debug /machine:IA64 
+# 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  /nologo /subsystem:windows /debug /machine:IA64 /incremental:no
+
+!ENDIF
+
+# Begin Target
+
+# Name "myshutdown - WinIA64 Release"
+# Name "myshutdown - WinIA64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp b/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
new file mode 100644
index 00000000000..2549606bf60
--- /dev/null
+++ b/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="mysqlshutdown" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=mysqlshutdown - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlshutdown_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlshutdown_ia64.mak" CFG="mysqlshutdown - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlshutdown - WinIA64 Release" (based on "Win32 (x86) Application")
+!MESSAGE "mysqlshutdown - WinIA64 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqlshutdown - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# 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
+# 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:windows  /machine:IA64
+# 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 bufferoverflowU.lib /nologo /subsystem:windows  /out:"../client_release/mysqlshutdown.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqlshutdown - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqlshutdown___Win64_Debug"
+# PROP BASE Intermediate_Dir "mysqlshutdown___Win64_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /W3 /Zi /Od /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# 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
+# 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:windows  /out:"../client_release/mysqlshutdown.exe" /machine:IA64
+# 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 bufferoverflowU.lib /nologo /subsystem:windows  /out:"../client_debug/mysqlshutdown.exe" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqlshutdown - WinIA64 Release"
+# Name "mysqlshutdown - WinIA64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\mysqlshutdown.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysqlshutdown.rc
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\mysql.ico
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp b/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
new file mode 100644
index 00000000000..eb17b6991f8
--- /dev/null
+++ b/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
@@ -0,0 +1,71 @@
+# Microsoft Developer Studio Project File - Name="mysqlwatch" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqlwatch - WinIA64 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlwatch_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqlwatch_ia64.mak" CFG="mysqlwatch - WinIA64 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqlwatch - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqlwatch.exe" /machine:IA64
+# Begin Target
+
+# Name "mysqlwatch - WinIA64 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\mysqlwatch.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/mysys/mysys_ia64.dsp b/VC++Files/mysys/mysys_ia64.dsp
new file mode 100644
index 00000000000..ed2dac53579
--- /dev/null
+++ b/VC++Files/mysys/mysys_ia64.dsp
@@ -0,0 +1,619 @@
+# Microsoft Developer Studio Project File - Name="mysys" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=mysys - WinIA64 TLS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysys.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysys.mak" CFG="mysys - WinIA64 TLS"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysys - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - WinIA64 Max" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - WinIA64 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - WinIA64 TLS" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysys - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /WX /Fr /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\mysys.lib"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\mysys.lib"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Max"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysys___WinIA64_Max"
+# PROP BASE Intermediate_Dir "mysys___WinIA64_Max"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# 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 /MT /W3 /Zi /O2 /I "../include" /I "../zlib" /D "USE_SYMDIR" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-max /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysys___WinIA64_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "mysys___WinIA64_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "mysys___WinIA64_TLS_DEBUG"
+# PROP Intermediate_Dir "mysys___WinIA64_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# SUBTRACT BASE CPP /Fr
+# ADD CPP /nologo /MTd /W3 /Zi /O2 /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib_debug\mysys_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_debug\mysys_tls.lib"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysys___WinIA64_TLS"
+# PROP BASE Intermediate_Dir "mysys___WinIA64_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "mysys___WinIA64_TLS"
+# PROP Intermediate_Dir "mysys___WinIA64_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\mysys_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\mysys_tls.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysys - WinIA64 Release"
+# Name "mysys - WinIA64 Debug"
+# Name "mysys - WinIA64 Max"
+# Name "mysys - WinIA64 TLS_DEBUG"
+# Name "mysys - WinIA64 TLS"
+# Begin Source File
+
+SOURCE=.\array.c
+
+!IF  "$(CFG)" == "mysys - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Debug"
+
+# SUBTRACT CPP /Fr
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS_DEBUG"
+
+# ADD BASE CPP /FR
+# ADD CPP /Zi /O2 /FR /G2 /EHsc /Wp64 /Zm600
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\charset-def.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\charset.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\checksum.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\default.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\errors.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_brkhant.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_dirname.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_fn_ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_format.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_getdate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_iocache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_iocache2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_keycache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_keycaches.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_loadpath.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_path.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_qsort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_qsort2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_radix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_same.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_sort.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_soundex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_strip.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_tempdir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_tempfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_wcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_wfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mulalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_aes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_alarm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_append.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_bit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_bitmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_chsize.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_clock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_copy.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_delete.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_div.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_fopen.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_fstream.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_gethostbyname.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_gethwaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_getsystime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_getwd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_handler.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_lib.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_lockmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_lread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_lwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_malloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_messnc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_mkdir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_net.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_once.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_pread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_pthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_quick.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_read.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_realloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_redel.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_rename.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_seek.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_sleep.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_static.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_static.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_symlink.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_symlink2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_sync.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_tempnam.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_thr_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_wincond.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_winsem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_winthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_write.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysys_priv.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ptr_cmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\queues.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\raid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\rijndael.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\safemalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sha1.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\string.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_alarm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_lock.c
+
+!IF  "$(CFG)" == "mysys - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Debug"
+
+# ADD CPP /Zi /Od /D "EXTRA_DEBUG" /G2 /EHsc /Wp64 /Zm600
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS_DEBUG"
+
+# ADD BASE CPP /D "EXTRA_DEBUG"
+# ADD CPP /Zi /O2 /D "EXTRA_DEBUG" /G2 /EHsc /Wp64 /Zm600
+
+!ELSEIF  "$(CFG)" == "mysys - WinIA64 TLS"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_mutex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_rwlock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tree.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\typelib.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/pack_isam/pack_isam_ia64.dsp b/VC++Files/pack_isam/pack_isam_ia64.dsp
new file mode 100644
index 00000000000..58b88f02f08
--- /dev/null
+++ b/VC++Files/pack_isam/pack_isam_ia64.dsp
@@ -0,0 +1,133 @@
+# Microsoft Developer Studio Project File - Name="pack_isam" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=pack_isam - WinIA64  classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "pack_isam_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "pack_isam_ia64.mak" CFG="pack_isam - WinIA64  classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "pack_isam - WinIA64  Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "pack_isam - WinIA64  Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "pack_isam - WinIA64  classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "pack_isam - WinIA64  Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/pack_isam.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "pack_isam - WinIA64  Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WinIA64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "../isam" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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:IA64
+# ADD LINK32 ..\lib_debug\dbug.lib ..\lib_debug\isam.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/pack_isam.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "pack_isam - WinIA64  classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "pack_isam___WinIA64 _classic"
+# PROP BASE Intermediate_Dir "pack_isam___WinIA64 _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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console  /out:"../client_release/pack_isam.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/pack_isam.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "pack_isam - WinIA64  Release"
+# Name "pack_isam - WinIA64  Debug"
+# Name "pack_isam - WinIA64  classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\isam\pack_isam.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/perror/perror_ia64.dsp b/VC++Files/perror/perror_ia64.dsp
new file mode 100644
index 00000000000..69fe18340dd
--- /dev/null
+++ b/VC++Files/perror/perror_ia64.dsp
@@ -0,0 +1,140 @@
+# Microsoft Developer Studio Project File - Name="perror" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=perror - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "perror_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "perror_ia64.mak" CFG="perror - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "perror - WinIA64 Release" (based on "Win32 (x86) Application")
+!MESSAGE "perror - WinIA64 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "perror - WinIA64 classic" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "perror - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "WIN64" /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# 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
+# 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:windows  /machine:IA64
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console  /out:"../client_release/perror.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "perror - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug  /machine:IA64
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\dbug.lib /nologo /incremental:no /debug  /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "perror - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "perror___Win64_classic"
+# PROP BASE Intermediate_Dir "perror___Win64_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" /D "WIN64" /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "WIN64" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
+# 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
+# ADD BASE LINK32 wsock32.lib 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  /out:"../client_release/perror.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/perror.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "perror - WinIA64 Release"
+# Name "perror - WinIA64 Debug"
+# Name "perror - WinIA64 classic"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\extra\perror.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/regex/regex_ia64.dsp b/VC++Files/regex/regex_ia64.dsp
new file mode 100644
index 00000000000..96088e1ce09
--- /dev/null
+++ b/VC++Files/regex/regex_ia64.dsp
@@ -0,0 +1,114 @@
+# Microsoft Developer Studio Project File - Name="regex" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=regex - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "regex.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "regex.mak" CFG="regex - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "regex - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "regex - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "regex - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /I "./" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\regex.lib"
+
+!ELSEIF  "$(CFG)" == "regex - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /I "./" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GF /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\regex.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "regex - WinIA64 Release"
+# Name "regex - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\debug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\regcomp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\regerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\regexec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\regfree.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\reginit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\split.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/replace/replace_ia64.dsp b/VC++Files/replace/replace_ia64.dsp
new file mode 100644
index 00000000000..925af8d8081
--- /dev/null
+++ b/VC++Files/replace/replace_ia64.dsp
@@ -0,0 +1,125 @@
+# Microsoft Developer Studio Project File - Name="replace" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=replace - WinIA64 classic
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "replace_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "replace_ia64.mak" CFG="replace - WinIA64 classic"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "replace - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "replace - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "replace - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "replace - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "Win64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "Win64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40b /d "NDEBUG"
+# ADD RSC /l 0x40b /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console  /machine:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/replace.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "replace - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "Win64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "Win64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40b /d "_DEBUG"
+# ADD RSC /l 0x40b /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 ../lib_debug/dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console /incremental:no  /out:"../client_debug/replace.exe" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "replace - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "replace___Win64_classic"
+# PROP BASE Intermediate_Dir "replace___Win64_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 ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "Win64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40b /d "NDEBUG"
+# ADD RSC /l 0x40b /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj /nologo /subsystem:console  /out:"../client_release/replace.exe" /machine:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/replace.exe" /libpath:"..\lib_release\\" /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "replace - WinIA64 Release"
+# Name "replace - WinIA64 Debug"
+# Name "replace - WinIA64 classic"
+# Begin Source File
+
+SOURCE=..\extra\replace.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/sql/mysqld_ia64.dsp b/VC++Files/sql/mysqld_ia64.dsp
new file mode 100644
index 00000000000..310f48fcfb9
--- /dev/null
+++ b/VC++Files/sql/mysqld_ia64.dsp
@@ -0,0 +1,2013 @@
+# Microsoft Developer Studio Project File - Name="mysqld" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqld - WinIA64 pro nt
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqld_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysqld_ia64.mak" CFG="mysqld - WinIA64 pro nt"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysqld - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 nt" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 Max nt" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 Max" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 classic" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 pro" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 classic nt" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqld - WinIA64 pro nt" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /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" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_release\myisammrg.lib ..\lib_release\innodb.lib ..\lib_release\zlib.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 ..\lib_release\myisam.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqld.exe" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_debug\zlib.lib ..\lib_debug\myisammrg.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\innodb.lib ..\lib_debug\myisam.lib 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 bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /out:"../client_debug/mysqld-debug.exe" /machine:IA64
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld__"
+# PROP BASE Intermediate_Dir "mysqld__"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "nt"
+# PROP Intermediate_Dir "nt"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN64__" /D "DBUG_OFF" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /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 "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt /G2 /EHsc /Wp64 /Zm600 /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
+# 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 /debug  /machine:IA64
+# ADD LINK32 ..\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 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 bufferoverflowU.lib /nologo /subsystem:console /map  /out:"../client_release/mysqld-nt.exe" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_Max_nt"
+# PROP BASE Intermediate_Dir "mysqld___Win64_Max_nt"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "max_nt"
+# PROP Intermediate_Dir "max_nt"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\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\mysys.lib 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 bufferoverflowU.lib /nologo /subsystem:console /map  /out:"../client_release/mysqld-max-nt.exe" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_Max"
+# PROP BASE Intermediate_Dir "mysqld___Win64_Max"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "max"
+# PROP Intermediate_Dir "max"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-max /G2 /EHsc /Wp64 /Zm600 /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
+# 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 /debug  /machine:IA64
+# ADD LINK32 ..\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\zlib.lib ..\lib_release\mysys.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_release/mysqld-max.exe" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_classic"
+# PROP BASE Intermediate_Dir "mysqld___Win64_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 ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../zlib" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-classic /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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  /machine:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqld.exe" /libpath:"..\lib_release" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_pro"
+# PROP BASE Intermediate_Dir "mysqld___Win64_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 ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-pro /G2 /EHsc /Wp64 /Zm600 /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=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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  /machine:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\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 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_pro/mysqld.exe" /libpath:"..\lib_release" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_classic_nt"
+# PROP BASE Intermediate_Dir "mysqld___Win64_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 ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /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" /D LICENSE=Commercial /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-classic-nt /G2 /EHsc /Wp64 /Zm600 /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
+# 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  /machine:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_classic/mysqld-nt.exe" /libpath:"..\lib_release" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysqld___Win64_pro_nt"
+# PROP BASE Intermediate_Dir "mysqld___Win64_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 ""
+MTL=midl.exe
+# 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 /MT /W3 /Zi /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-pro-nt" /G2 /EHsc /Wp64 /Zm600
+# 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
+# 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  /machine:IA64
+# SUBTRACT BASE LINK32 /debug
+# ADD LINK32 ..\lib_release\zlib.lib ..\lib_release\mysys.lib ..\lib_release\innodb.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib 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 bufferoverflowU.lib /nologo /subsystem:console  /out:"../client_pro/mysqld-nt.exe" /libpath:"..\lib_release" /machine:IA64
+# SUBTRACT LINK32 /debug
+
+!ENDIF 
+
+# Begin Target
+
+# Name "mysqld - WinIA64 Release"
+# Name "mysqld - WinIA64 Debug"
+# Name "mysqld - WinIA64 nt"
+# Name "mysqld - WinIA64 Max nt"
+# Name "mysqld - WinIA64 Max"
+# Name "mysqld - WinIA64 classic"
+# Name "mysqld - WinIA64 pro"
+# Name "mysqld - WinIA64 classic nt"
+# Name "mysqld - WinIA64 pro nt"
+# Begin Source File
+
+SOURCE=.\client.c
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\derror.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\discover.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\libmysql\errmsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\field.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\field_conv.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\filesort.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\gstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_berkeley.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_heap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_innodb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_isam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_isammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_myisam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_myisammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\handler.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash_filo.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash_filo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hostname.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\init.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_buff.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_cmpfunc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_create.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_func.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_geofunc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_row.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_strfunc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_subselect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_sum.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_timefunc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_uniq.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\key.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\lock.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\log.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\log_event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\message.mc
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+# Begin Custom Build
+InputPath=.\message.mc
+
+BuildCmds= \
+	mc message.mc
+
+"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\message.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_iocache.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_time.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\myisammrg\myrg_rnext_same.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysqld.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nt_servc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\nt_servc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_range.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_range.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\OPT_SUM.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\pack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\password.c
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\procedure.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\protocol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\records.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\repl_failsafe.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\set_var.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\slave.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\spatial.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_acl.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_analyse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_base.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_cache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_class.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_crypt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_crypt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_db.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_delete.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_derived.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_do.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_error.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_help.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_insert.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_lex.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_list.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_load.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_map.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_parse.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_prepare.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_rename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_repl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_select.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_show.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_state.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_string.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_table.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_test.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_udf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_union.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_update.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_yacc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\strfunc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_malloc.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\time.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\tztime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\uniques.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\unireg.cpp
+
+!IF  "$(CFG)" == "mysqld - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Debug"
+
+# ADD CPP /G5 /Zi /Od /G2 /EHsc /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 Max"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 classic nt"
+
+!ELSEIF  "$(CFG)" == "mysqld - WinIA64 pro nt"
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/sql/mysqldmax_ia64.dsp b/VC++Files/sql/mysqldmax_ia64.dsp
new file mode 100644
index 00000000000..9d79d224e4a
--- /dev/null
+++ b/VC++Files/sql/mysqldmax_ia64.dsp
@@ -0,0 +1,1542 @@
+# Microsoft Developer Studio Project File - Name="mysqldmax" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysqldmax - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mysqldmax.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mysqldmax.mak" CFG="mysqldmax - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mysqldmax - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldmax - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldmax - Win32 nt" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldmax - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldmax - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "mysqldmax - WinIA64 nt" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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  /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "HAVE_INNOBASE_DB" /FD /c /O2
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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 
+# 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\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innobase-opt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console /pdb:none /debug  /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-opt.exe"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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  /I "../include" /I "../regex" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "HAVE_INNOBASE_DB" /FR /FD /c /Od
+# ADD BASE RSC /l 0x416 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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:IA64
+# 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\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_release\innobase-opt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console /incremental:no /pdb:"debug/mysqld.pdb" /debug  /nodefaultlib:"LIBC" /out:"../client_debug/mysqld-max.exe" 
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "nt"
+# PROP BASE Intermediate_Dir "nt"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "nt"
+# PROP Intermediate_Dir "nt"
+# 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  /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "HAVE_INNOBASE_DB" /FD /c /O2
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  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 
+# 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\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 ..\lib_release\innobase-nt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console /pdb:"NT/mysqld-nt.pdb" /map:"NT/mysqld-nt.map"  /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-nt.exe"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo  /MT /W3  /I "../include" /I "../regex" /D"NDEBUG" /D"DBUG_OFF" /D"MYSQL_SERVER" /D"_WINDOWS" /D"_CONSOLE" /D"_MBCS" /D"HAVE_BERKELEY_DB" /D"HAVE_INNOBASE_DB" /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   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:IA64
+# 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\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innobase-opt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console  /debug /machine:IA64 /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-opt.exe" /incremental:no
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo  /MTd /W3 /Gm   /I "../include" /I "../regex" /D"_DEBUG" /D"SAFEMALLOC" /D"SAFE_MUTEX" /D"MYSQL_SERVER" /D"_WINDOWS" /D"_CONSOLE" /D"_MBCS" /D"HAVE_INNOBASE_DB" /FR /FD /c /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE RSC /l 0x416 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   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:IA64 
+# 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\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_release\innobase-opt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console  /pdb:"debug/mysqld.pdb" /debug /machine:IA64 /nodefaultlib:"LIBC" /out:"../client_debug/mysqld-max.exe"  /incremental:no
+# SUBTRACT LINK32 
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "nt"
+# PROP BASE Intermediate_Dir "nt"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "nt"
+# PROP Intermediate_Dir "nt"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo  /MT /W3  /I "../include" /I "../regex" /D"NDEBUG" /D"__NT__" /D"DBUG_OFF" /D"MYSQL_SERVER" /D"_WINDOWS" /D"_CONSOLE" /D"_MBCS" /D"HAVE_INNOBASE_DB" /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# ADD BASE RSC /l 0x416 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib   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:IA64
+# 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\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 ..\lib_release\innobase-nt.lib ..\lib_release\libdb32s.lib /nologo /subsystem:console /pdb:"NT/mysqld-nt.pdb" /map:"NT/mysqld-nt.map" /machine:IA64 /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-nt.exe" /incremental:no
+# SUBTRACT LINK32 
+
+!ENDIF
+
+# Begin Target
+
+# Name "mysqldmax - Win32 Release"
+# Name "mysqldmax - Win32 Debug"
+# Name "mysqldmax - Win32 nt"
+# Name "mysqldmax - WinIA64 Release"
+# Name "mysqldmax - WinIA64 Debug"
+# Name "mysqldmax - WinIA64 nt"
+# Begin Source File
+
+SOURCE=.\convert.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\derror.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\field.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\field_conv.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\filesort.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_berkeley.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_heap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_innobase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_isam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_isammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_myisam.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ha_myisammrg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\handler.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash_filo.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hash_filo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hostname.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\init.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_buff.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_cmpfunc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_create.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_func.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_strfunc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_sum.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_timefunc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\item_uniq.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\key.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\lock.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\log.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\log_event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mf_iocache.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\mini_client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\mini_client_errors.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mysqld.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\net_pkg.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\net_serv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nt_servc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\nt_servc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_ft.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_range.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_range.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\opt_sum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\password.c
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\procedure.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\records.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\slave.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_acl.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_analyse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_base.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_cache.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_class.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_crypt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_crypt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_db.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_delete.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_insert.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_lex.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_list.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_load.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_map.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_parse.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_rename.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_repl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_select.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_show.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_string.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_table.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_test.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_update.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\sql_yacc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\strfunc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\table.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\thr_malloc.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\time.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\unireg.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\violite.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/strings/strings_ia64.dsp b/VC++Files/strings/strings_ia64.dsp
new file mode 100644
index 00000000000..6449b2b1355
--- /dev/null
+++ b/VC++Files/strings/strings_ia64.dsp
@@ -0,0 +1,266 @@
+# Microsoft Developer Studio Project File - Name="strings" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=strings - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "strings.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "strings.mak" CFG="strings - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "strings - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "strings - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "strings - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\strings.lib"
+
+!ELSEIF  "$(CFG)" == "strings - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /GF /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "strings - WinIA64 Release"
+# Name "strings - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\bchange.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bcmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bfill.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bmove512.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bmove_upp.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-big5.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-bin.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-czech.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-euc_kr.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-extra.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-gb2312.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-gbk.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-latin1.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
+
+SOURCE=".\ctype-sjis.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-tis620.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-uca.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-ucs2.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-ujis.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-win1250ch.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ctype.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\int2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\is_prefix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\llstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\longlong2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_strtoll10.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\my_vsnprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_strinstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\str2int.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strcend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strfill.c
+# 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=.\strtod.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoul.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoull.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strxmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strxnmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\xml.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/test1/test1_ia64.dsp b/VC++Files/test1/test1_ia64.dsp
new file mode 100644
index 00000000000..6e283ac0224
--- /dev/null
+++ b/VC++Files/test1/test1_ia64.dsp
@@ -0,0 +1,104 @@
+# Microsoft Developer Studio Project File - Name="test1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test1 - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test1_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test1_ia64.mak" CFG="test1 - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test1 - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test1 - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test1 - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /Zi /O2 /I "../include" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# 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:IA64
+# ADD LINK32 ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console  /machine:IA64
+
+!ELSEIF  "$(CFG)" == "test1 - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# ADD LINK32 libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /libpath:"..\lib_debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test1 - WinIA64 Release"
+# Name "test1 - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\mysql_thr.c
+
+!IF  "$(CFG)" == "test1 - WinIA64 Release"
+
+# ADD CPP /MT /Zi /O2 /G2 /EHsc /Wp64 /Zm600
+
+!ELSEIF  "$(CFG)" == "test1 - WinIA64 Debug"
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/tests/mysql_client_test_ia64.dsp b/VC++Files/tests/mysql_client_test_ia64.dsp
new file mode 100644
index 00000000000..6b4f29ed59f
--- /dev/null
+++ b/VC++Files/tests/mysql_client_test_ia64.dsp
@@ -0,0 +1,87 @@
+# Microsoft Developer Studio Project File - Name="mysql_client_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=mysql_client_test - WinIA64 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql_client_test_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "mysql_client_test_ia64.mak" CFG="mysql_client_test - WinIA64 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mysql_client_test - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\Release"
+# PROP BASE Intermediate_Dir ".\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\Release"
+# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32
+# ADD MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32
+# ADD BASE CPP /nologo /G6 /MTd /W3 /GX /Ob1 /Gy /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /c
+# ADD CPP /nologo /G6 /MTd /W3 /GX /Ob1 /Gy /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\tests\mysql_client_test.exe" /machine:IA64
+# SUBTRACT BASE LINK32 /pdb:none
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib /out:"..\tests\mysql_client_test.exe" /machine:IA64 /machine:IA64
+# SUBTRACT LINK32 /pdb:none
+# Begin Target
+
+# Name "mysql_client_test - WinIA64 Release"
+# Begin Source File
+
+SOURCE=tests\mysql_client_test.c
+DEP_CPP_MYSQL=\
+	"..\include\config-netware.h"\
+	"..\include\config-os2.h"\
+	"..\include\config-win.h"\
+	"..\include\errmsg.h"\
+	"..\include\m_ctype.h"\
+	"..\include\m_string.h"\
+	"..\include\my_alloc.h"\
+	"..\include\my_config.h"\
+	"..\include\my_dbug.h"\
+	"..\include\my_dir.h"\
+	"..\include\my_getopt.h"\
+	"..\include\my_global.h"\
+	"..\include\my_list.h"\
+	"..\include\my_pthread.h"\
+	"..\include\my_sys.h"\
+	"..\include\mysql.h"\
+	"..\include\mysql_com.h"\
+	"..\include\mysql_time.h"\
+	"..\include\mysql_version.h"\
+	"..\include\raid.h"\
+	"..\include\t_ctype.h"\
+	"..\include\typelib.h"\
+	
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/thr_test/thr_test_ia64.dsp b/VC++Files/thr_test/thr_test_ia64.dsp
new file mode 100644
index 00000000000..90b6ca02648
--- /dev/null
+++ b/VC++Files/thr_test/thr_test_ia64.dsp
@@ -0,0 +1,106 @@
+# Microsoft Developer Studio Project File - Name="thr_test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=thr_test - WinIA64 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "thr_test_ia64.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "thr_test_ia64.mak" CFG="thr_test - WinIA64 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "thr_test - WinIA64 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "thr_test - WinIA64 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "thr_test - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40b /d "NDEBUG"
+# ADD RSC /l 0x40b /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console  /machine:IA64
+# 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 bufferoverflowU.lib /nologo /subsystem:console  /machine:IA64
+# SUBTRACT LINK32 /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "thr_test - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+MTL=midl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /D "__WIN64__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x40b /d "_DEBUG"
+# ADD RSC /l 0x40b /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug  /machine:IA64
+# 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 bufferoverflowU.lib /nologo /subsystem:console /incremental:no /debug  /machine:IA64
+
+!ENDIF 
+
+# Begin Target
+
+# Name "thr_test - WinIA64 Release"
+# Name "thr_test - WinIA64 Debug"
+# Begin Source File
+
+SOURCE=.\thr_test.c
+
+!IF  "$(CFG)" == "thr_test - WinIA64 Release"
+
+# ADD CPP /G5 /Zi /O2 /G2 /EHsc /Wp64 /Zm600
+
+!ELSEIF  "$(CFG)" == "thr_test - WinIA64 Debug"
+
+# ADD CPP /Zi /Od /FAcs /G2 /EHsc /Wp64 /Zm600
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/vio/vio_ia64.dsp b/VC++Files/vio/vio_ia64.dsp
new file mode 100644
index 00000000000..9dd9a0b9eb6
--- /dev/null
+++ b/VC++Files/vio/vio_ia64.dsp
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="vio" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=vio - WinIA64  Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "vio.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "vio.mak" CFG="vio - WinIA64  Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "vio - WinIA64  Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "vio - WinIA64  Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "vio - WinIA64  Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WinIA64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\vio.lib"
+
+!ELSEIF  "$(CFG)" == "vio - WinIA64  Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WinIA64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /D "_IA64_" /D "WinIA64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\vio.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "vio - WinIA64  Release"
+# Name "vio - WinIA64  Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\vio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\viosocket.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\viossl.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\viosslfactories.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
diff --git a/VC++Files/zlib/zlib_ia64.dsp b/VC++Files/zlib/zlib_ia64.dsp
new file mode 100644
index 00000000000..c8cb0f6a38b
--- /dev/null
+++ b/VC++Files/zlib/zlib_ia64.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - WinIA64 authent
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - WinIA64 authent"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "zlib - WinIA64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - WinIA64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - WinIA64 authent" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "zlib - WinIA64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /Zi /O2 /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\zlib.lib"
+
+!ELSEIF  "$(CFG)" == "zlib - WinIA64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /Zi /Od /D "_DEBUG" /D "__WIN64__" /D "_WINDOWS" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\zlib.lib"
+
+!ELSEIF  "$(CFG)" == "zlib - WinIA64 authent"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zlib___WinIA64_authent"
+# PROP BASE Intermediate_Dir "zlib___WinIA64_authent"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "zlib___WinIA64_authent"
+# PROP Intermediate_Dir "zlib___WinIA64_authent"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /Zi /O2 /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /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
+# ADD BASE LIB32 /nologo /out:"..\lib_release\zlib.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\zlib.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "zlib - WinIA64 Release"
+# Name "zlib - WinIA64 Debug"
+# Name "zlib - WinIA64 authent"
+# Begin Source File
+
+SOURCE=.\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crc32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infback.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffast.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trees.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zutil.h
+# End Source File
+# End Target
+# End Project
diff --git a/bdb/dist/s_java b/bdb/dist/s_java
index f3c856d0532..f7c96e823a1 100755
--- a/bdb/dist/s_java
+++ b/bdb/dist/s_java
@@ -5,7 +5,7 @@
 
 msgjava="/* DO NOT EDIT: automatically built by dist/s_java. */"
 
-. RELEASE
+. ./RELEASE
 
 t=/tmp/__java
 c=/tmp/__javajnic
diff --git a/bdb/dist/s_javah b/bdb/dist/s_javah
index 480856e4b5c..67c41d09c4d 100755
--- a/bdb/dist/s_javah
+++ b/bdb/dist/s_javah
@@ -8,7 +8,7 @@
 # Using Sun's JDK rather than some other installation ensures
 # that the header files will not be constantly changed.
 
-. RELEASE
+. ./RELEASE
 
 JAVAC=javac
 JAVAH=javah
diff --git a/bdb/dist/s_readme b/bdb/dist/s_readme
index 229a152b8a9..1da9f9681c0 100755
--- a/bdb/dist/s_readme
+++ b/bdb/dist/s_readme
@@ -8,7 +8,7 @@ d=..
 t=/tmp/__t
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-. RELEASE
+. ./RELEASE
 
 cat << END_OF_README>$t
 $DB_VERSION_STRING
diff --git a/bdb/dist/s_test b/bdb/dist/s_test
index 266f27a743f..16f3b9712d0 100755
--- a/bdb/dist/s_test
+++ b/bdb/dist/s_test
@@ -9,7 +9,7 @@ msg2="# Automatically built by dist/s_test; may require local editing."
 t=/tmp/__t
 trap 'rm -f $t; exit 0' 0 1 2 3 13 15
 
-. RELEASE
+. ./RELEASE
 
 (echo "$msg1"					&& \
  echo ""					&& \
diff --git a/bdb/dist/s_vxworks b/bdb/dist/s_vxworks
index b7cf785f78b..05c2599d02c 100644
--- a/bdb/dist/s_vxworks
+++ b/bdb/dist/s_vxworks
@@ -5,7 +5,7 @@
 
 msgc="/* DO NOT EDIT: automatically built by dist/s_vxworks. */"
 
-. RELEASE
+. ./RELEASE
 
 s=/tmp/__db_a
 t=/tmp/__db_b
diff --git a/bdb/dist/s_win32 b/bdb/dist/s_win32
index 78814ababa1..207978b82bb 100755
--- a/bdb/dist/s_win32
+++ b/bdb/dist/s_win32
@@ -6,7 +6,7 @@
 msgc="/* DO NOT EDIT: automatically built by dist/s_win32. */"
 msgw="; DO NOT EDIT: automatically built by dist/s_win32."
 
-. RELEASE
+. ./RELEASE
 
 s=/tmp/__db_a$$
 t=/tmp/__db_b$$
diff --git a/bdb/dist/s_win32_dsp b/bdb/dist/s_win32_dsp
index 3b0bef831ba..af5551ec248 100644
--- a/bdb/dist/s_win32_dsp
+++ b/bdb/dist/s_win32_dsp
@@ -3,7 +3,7 @@
 #
 # Build Windows/32 .dsp files.
 
-. RELEASE
+. ./RELEASE
 
 BUILDDIR=../build_win32
 SRCFILES=srcfiles.in
@@ -35,7 +35,9 @@ create_dsp()
             -e "s/@srcfile@/$srcfile/g" \
             < $srctemplate >> $dspoutput.insert
     done
-    sed -e "/@SOURCE_FILES@/r$dspoutput.insert" \
+    # We need exactly one space after the 'r' modifier
+    # See 5.9 in http://www.student.northpark.edu/pemente/sed/sedfaq.txt
+    sed -e "/@SOURCE_FILES@/r $dspoutput.insert" \
         -e "/@SOURCE_FILES@/d" \
         -e "s/@project_name@/$projname/g" \
         -e "s/@DB_VERSION_MAJOR@/$DB_VERSION_MAJOR/g" \
diff --git a/client/mysql.cc b/client/mysql.cc
index babb6600ac4..16b26cd745d 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -739,7 +739,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       strmov(delimiter, DEFAULT_DELIMITER);
     else
       strmake(delimiter, argument, sizeof(delimiter) - 1);
-    delimiter_length= strlen(delimiter);
+    delimiter_length= (uint)strlen(delimiter);
     delimiter_str= delimiter;
     break;
   case OPT_LOCAL_INFILE:
@@ -1680,7 +1680,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
   if (!connected && reconnect())
     return 1;
 
-  if ((error= mysql_real_query_for_lazy(server_cmd,strlen(server_cmd))) ||
+  if ((error= mysql_real_query_for_lazy(server_cmd,(int)strlen(server_cmd))) ||
       (error= mysql_store_result_for_lazy(&result)))
     return error;
 
@@ -1766,7 +1766,7 @@ com_help(String *buffer __attribute__((unused)),
   for (i = 0; commands[i].name; i++)
   {
     end= strmov(buff, commands[i].name);
-    for (j= strlen(commands[i].name); j < 10; j++)
+    for (j= (int)strlen(commands[i].name); j < 10; j++)
       end= strmov(end, " ");
     if (commands[i].func)
       tee_fprintf(stdout, "%s(\\%c) %s\n", buff,
@@ -2143,7 +2143,7 @@ print_table_data_xml(MYSQL_RES *result)
   mysql_field_seek(result,0);
 
   tee_fputs("<?xml version=\"1.0\"?>\n\n<resultset statement=\"", PAGER);
-  xmlencode_print(glob_buffer.ptr(), strlen(glob_buffer.ptr()));
+  xmlencode_print(glob_buffer.ptr(), (int)strlen(glob_buffer.ptr()));
   tee_fputs("\">", PAGER);
 
   fields = mysql_fetch_fields(result);
@@ -2630,7 +2630,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)
     return 0;
   }
   strmake(delimiter, tmp, sizeof(delimiter) - 1);
-  delimiter_length= strlen(delimiter);
+  delimiter_length= (int)strlen(delimiter);
   delimiter_str= delimiter;
   return 0;
 }
@@ -2640,8 +2640,6 @@ static int
 com_use(String *buffer __attribute__((unused)), char *line)
 {
   char *tmp, buff[FN_REFLEN + 1];
-  MYSQL_RES *res;
-  MYSQL_ROW row;
 
   bzero(buff, sizeof(buff));
   strmov(buff, line);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 4ba64009334..604c9ff8227 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1813,7 +1813,7 @@ static void dumpTable(uint numFields, char *table)
                 char *ptr= row[i], *end= ptr+ lengths[i];
                 fputs("0x", md_result_file);
                 for (; ptr < end ; ptr++)
-                  fprintf(md_result_file, "%02X", *ptr);
+		  fprintf(md_result_file, "%02X", *((uchar *)ptr));
               }
               else
                 unescape(md_result_file, row[i], lengths[i]);
diff --git a/client/readline.cc b/client/readline.cc
index 52ecb4e5c68..3d524633d69 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -108,7 +108,7 @@ init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
 */
 static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
 {
-  uint old_length=buffer->end - buffer->buffer;
+  uint old_length=(uint)(buffer->end - buffer->buffer);
   uint length= (uint) strlen(str);
   if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line=
 	(char*)my_realloc(buffer->buffer, old_length+length+2,
diff --git a/client/sql_string.cc b/client/sql_string.cc
index 7de0df02f53..9dcf19dad1d 100644
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@@ -544,7 +544,7 @@ int String::reserve(uint32 space_needed, uint32 grow_by)
 
 void String::qs_append(const char *str)
 {
-  int len = strlen(str);
+  int len = (int)strlen(str);
   memcpy(Ptr + str_length, str, len + 1);
   str_length += len;
 }
@@ -553,7 +553,7 @@ void String::qs_append(double d)
 {
   char *buff = Ptr + str_length;
   sprintf(buff,"%.14g", d);
-  str_length += strlen(buff);
+  str_length += (int)strlen(buff);
 }
 
 void String::qs_append(double *d)
diff --git a/configure.in b/configure.in
index 93d6cbe515e..9a58e0c9b8c 100644
--- a/configure.in
+++ b/configure.in
@@ -1815,7 +1815,13 @@ AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(re_comp regcomp strdup)
 
-AC_CHECK_HEADERS(vis.h)
+dnl Sun compilers have their own vis.h that is about something
+dnl totally different. So, not to change the libedit source, we
+dnl do some additional checks before we define HAVE_VIS_H.
+AC_CHECK_HEADER(vis.h,
+  [AC_CHECK_FUNC(strvis,
+    [AC_DEFINE([HAVE_VIS_H], [1],[Found vis.h and the strvis() function])])])
+
 AC_CHECK_FUNCS(strlcat strlcpy)
 AC_CHECK_FUNCS(issetugid)
 AC_CHECK_FUNCS(fgetln)
diff --git a/innobase/buf/buf0lru.c b/innobase/buf/buf0lru.c
index 8460a049d3e..18c4f8c10fb 100644
--- a/innobase/buf/buf0lru.c
+++ b/innobase/buf/buf0lru.c
@@ -878,11 +878,11 @@ buf_LRU_block_remove_hashed_page(
 			(ulong) block->offset);
                 if (buf_page_hash_get(block->space, block->offset)) {
                         fprintf(stderr,
-"InnoDB: From hash table we find block %lx of %lu %lu which is not %lx\n",
-                (ulong) buf_page_hash_get(block->space, block->offset),
+"InnoDB: From hash table we find block %p of %lu %lu which is not %p\n",
+		buf_page_hash_get(block->space, block->offset),
                 (ulong) buf_page_hash_get(block->space, block->offset)->space,
                 (ulong) buf_page_hash_get(block->space, block->offset)->offset,
-		(ulong) block);
+		block);
                 }
 
 #ifdef UNIV_DEBUG
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index e2681369a8e..02f46ea7b18 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -2326,8 +2326,9 @@ dict_scan_to(
 			/* Outside quotes: look for the keyword. */
 			ulint	i;
 			for (i = 0; string[i]; i++) {
-				if (toupper((ulint)(ptr[i]))
-					!= toupper((ulint)(string[i]))) {
+				if (toupper((int)(unsigned char)(ptr[i]))
+						!= toupper((int)(unsigned char)
+						(string[i]))) {
 					goto nomatch;
 				}
 			}
diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c
index 1f4ebe810b4..b33111b1ff1 100644
--- a/innobase/dict/dict0load.c
+++ b/innobase/dict/dict0load.c
@@ -730,7 +730,6 @@ dict_load_table(
 	ulint		space;
 	ulint		n_cols;
 	ulint		err;
-	ulint		mix_len;
 	mtr_t		mtr;
 	
 #ifdef UNIV_SYNC_DEBUG
@@ -778,40 +777,6 @@ dict_load_table(
 		return(NULL);
 	}
 
-	/* Track a corruption bug reported on the MySQL mailing list Jan 14,
-	2005: mix_len had a value different from 0 */
-
-	field = rec_get_nth_field_old(rec, 7, &len);
-	ut_a(len == 4);
-
-	mix_len = mach_read_from_4(field);
-
-	if (mix_len != 0 && mix_len != 0x80000000) {
-		ut_print_timestamp(stderr);
-		
-		fprintf(stderr,
-			"  InnoDB: table %s has a nonsensical mix len %lu\n",
-			name, (ulong)mix_len);
-	}
-
-#ifndef UNIV_HOTBACKUP
-#if MYSQL_VERSION_ID < 50003
-	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the
-	"compact format" flag. */
-	field = rec_get_nth_field(rec, 7, &len);
-	if (mach_read_from_1(field) & 0x80) {
-		btr_pcur_close(&pcur);
-		mtr_commit(&mtr);
-		mem_heap_free(heap);
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: table %s is in the new compact format\n"
-			"InnoDB: of MySQL 5.0.3 or later\n", name);
-		return(NULL);
-	}
-#endif /* MYSQL_VERSION_ID < 50300 */
-#endif /* !UNIV_HOTBACKUP */
-
 	ut_a(0 == ut_strcmp("SPACE",
 		dict_field_get_col(
 		dict_index_get_nth_field(sys_index, 9))->name));
diff --git a/innobase/eval/eval0proc.c b/innobase/eval/eval0proc.c
index f710fed880f..50676e4f3fc 100644
--- a/innobase/eval/eval0proc.c
+++ b/innobase/eval/eval0proc.c
@@ -161,7 +161,7 @@ for_step(
 {
 	for_node_t*	node;
 	que_node_t*	parent;
-	int		loop_var_value;
+	lint		loop_var_value;
 
 	ut_ad(thr);
 	
diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic
index 714c30e3642..82d88099c3f 100644
--- a/innobase/include/mem0mem.ic
+++ b/innobase/include/mem0mem.ic
@@ -606,7 +606,7 @@ mem_strdupq(
 	char*		dst;
 	char*		d;
 	const char*	s	= str;
-	int		len	= strlen(str) + 3;
+	size_t		len	= strlen(str) + 3;
 	/* calculate the number of quote characters in the string */
 	while((s = strchr(s, q)) != NULL) {
 		s++;
diff --git a/innobase/include/page0page.ic b/innobase/include/page0page.ic
index ac6b0263a7d..bc0805ca30c 100644
--- a/innobase/include/page0page.ic
+++ b/innobase/include/page0page.ic
@@ -549,10 +549,10 @@ page_rec_get_next(
 "InnoDB: Next record offset is nonsensical %lu in record at offset %lu\n",
 		(ulong)offs, (ulong)(rec - page));
 		fprintf(stderr,
-"\nInnoDB: rec address %lx, first buffer frame %lx\n"
-"InnoDB: buffer pool high end %lx, buf fix count %lu\n",
-				(ulong)rec, (ulong)buf_pool->frame_zero,
-				(ulong)buf_pool->high_end,
+"\nInnoDB: rec address %p, first buffer frame %p\n"
+"InnoDB: buffer pool high end %p, buf fix count %lu\n",
+				rec, buf_pool->frame_zero,
+				buf_pool->high_end,
 				(ulong)buf_block_align(rec)->buf_fix_count);
 		buf_page_print(page);
 
diff --git a/innobase/include/pars0pars.h b/innobase/include/pars0pars.h
index 28985e2f9d0..62a41a881e8 100644
--- a/innobase/include/pars0pars.h
+++ b/innobase/include/pars0pars.h
@@ -414,7 +414,7 @@ pars_complete_graph_for_exec(
 
 /* Struct used to denote a reserved word in a parsing tree */
 struct pars_res_word_struct{
-	ulint	code;	/* the token code for the reserved word from
+	int	code;	/* the token code for the reserved word from
 			pars0grm.h */
 };
 
diff --git a/innobase/include/pars0sym.h b/innobase/include/pars0sym.h
index a40523861dd..633a49e3cb5 100644
--- a/innobase/include/pars0sym.h
+++ b/innobase/include/pars0sym.h
@@ -152,7 +152,7 @@ struct sym_tab_struct{
 					parser */
 	const char*		sql_string;
 					/* SQL string to parse */
-	int			string_len;
+	size_t			string_len;
 					/* SQL string length */
 	int			next_char_pos;
 					/* position of the next character in
diff --git a/innobase/mem/mem0dbg.c b/innobase/mem/mem0dbg.c
index ea8c296f8cf..7c0be818948 100644
--- a/innobase/mem/mem0dbg.c
+++ b/innobase/mem/mem0dbg.c
@@ -445,7 +445,7 @@ mem_heap_validate_or_print(
 		    && (mem_block_get_len(block) > UNIV_PAGE_SIZE)) {
 
 			fprintf(stderr,
-"InnoDB: Error: mem block %lx length %lu > UNIV_PAGE_SIZE\n", (ulong) block,
+"InnoDB: Error: mem block %p length %lu > UNIV_PAGE_SIZE\n", block,
 				(ulong) mem_block_get_len(block));
 		    	/* error */
 
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index 969f7aee859..eeba98a8ab2 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -2053,8 +2053,8 @@ try_again:
 	ut_ad(buf);
 	ut_ad(n > 0);
 
-	low = offset;
-	high = offset_high;
+	low = (DWORD) offset;
+	high = (DWORD) offset_high;
 
 	/* Protect the seek / read operation with a mutex */
 	i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2072,7 +2072,7 @@ try_again:
 	
         os_n_pending_reads++;
         
-	ret = ReadFile(file, buf, n, &len, NULL);
+	ret = ReadFile(file, buf, (DWORD) n, &len, NULL);
 
         os_n_pending_reads--;
 
@@ -2164,8 +2164,8 @@ try_again:
 	ut_ad(buf);
 	ut_ad(n > 0);
 
-	low = offset;
-	high = offset_high;
+	low = (DWORD) offset;
+	high = (DWORD) offset_high;
 
 	/* Protect the seek / read operation with a mutex */
 	i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2183,7 +2183,7 @@ try_again:
 	
         os_n_pending_reads++;
         
-	ret = ReadFile(file, buf, n, &len, NULL);
+	ret = ReadFile(file, buf, (DWORD) n, &len, NULL);
 
         os_n_pending_reads--;
         
@@ -2258,8 +2258,8 @@ os_file_write(
 	ut_ad(buf);
 	ut_ad(n > 0);
 retry:
-	low = offset;
-	high = offset_high;
+	low = (DWORD) offset;
+	high = (DWORD) offset_high;
 	
 	/* Protect the seek / write operation with a mutex */
 	i = ((ulint) file) % OS_FILE_N_SEEK_MUTEXES;
@@ -2288,7 +2288,7 @@ retry:
 
         os_n_pending_writes++;
         
-	ret = WriteFile(file, buf, n, &len, NULL);
+	ret = WriteFile(file, buf, (DWORD) n, &len, NULL);
 
         os_n_pending_writes--;
 	
@@ -3279,7 +3279,7 @@ os_aio(
 #ifdef WIN_ASYNC_IO
 	ibool		retval;
 	BOOL		ret		= TRUE;
-	DWORD		len		= n;
+	DWORD		len		= (DWORD) n;
 	void*		dummy_mess1;
 	void*		dummy_mess2;
 	ulint		dummy_type;
@@ -4126,7 +4126,7 @@ loop:
 	if (os_n_file_reads == os_n_file_reads_old) {
 		avg_bytes_read = 0.0;
 	} else {
-		avg_bytes_read = os_bytes_read_since_printout /
+		avg_bytes_read = (double) os_bytes_read_since_printout /
 				(os_n_file_reads - os_n_file_reads_old);
 	}
 
diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c
index c48c44a4c70..18d92af5054 100644
--- a/innobase/os/os0sync.c
+++ b/innobase/os/os0sync.c
@@ -361,7 +361,7 @@ os_event_wait_time(
 	ut_a(event);
 
 	if (time != OS_SYNC_INFINITE_TIME) {
-		err = WaitForSingleObject(event->handle, time / 1000);
+		err = WaitForSingleObject(event->handle, (DWORD) time / 1000);
 	} else {
 		err = WaitForSingleObject(event->handle, INFINITE);
 	}
@@ -408,7 +408,7 @@ os_event_wait_multiple(
 	ut_a(native_event_array);
 	ut_a(n > 0);
 
-	index = WaitForMultipleObjects(n, native_event_array,
+	index = WaitForMultipleObjects((DWORD) n, native_event_array,
 					FALSE,	   /* Wait for any 1 event */
 					INFINITE); /* Infinite wait time
 						   limit */
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c
index 91061bc8459..847d0ee1cc7 100644
--- a/innobase/os/os0thread.c
+++ b/innobase/os/os0thread.c
@@ -100,7 +100,7 @@ os_thread_create(
 {
 #ifdef __WIN__
 	os_thread_t	thread;
-	ulint           win_thread_id;
+	DWORD		win_thread_id;
 
 	os_mutex_enter(os_sync_mutex);
 	os_thread_count++;
@@ -253,7 +253,7 @@ os_thread_sleep(
 	ulint	tm)	/* in: time in microseconds */
 {
 #ifdef __WIN__
-	Sleep(tm / 1000);
+	Sleep((DWORD) tm / 1000);
 #elif defined(__NETWARE__)
 	delay(tm / 1000);
 #else
diff --git a/innobase/rem/rem0cmp.c b/innobase/rem/rem0cmp.c
index 193bda75f24..74348b865a8 100644
--- a/innobase/rem/rem0cmp.c
+++ b/innobase/rem/rem0cmp.c
@@ -322,7 +322,9 @@ cmp_data_data_slow(
 		&& dtype_get_charset_coll(cur_type->prtype) !=
 				data_mysql_latin1_swedish_charset_coll)) {
 
-		return(cmp_whole_field(cur_type, data1, len1, data2, len2));
+		return(cmp_whole_field(cur_type,
+					data1, (unsigned) len1,
+					data2, (unsigned) len2));
 	}
 	
 	/* Compare then the fields */
@@ -532,8 +534,9 @@ cmp_dtuple_rec_with_match(
 
 			ret = cmp_whole_field(
 				cur_type,
-				dfield_get_data(dtuple_field), dtuple_f_len,
-				rec_b_ptr, rec_f_len);
+				dfield_get_data(dtuple_field),
+				(unsigned) dtuple_f_len,
+				rec_b_ptr, (unsigned) rec_f_len);
 
 			if (ret != 0) {
 				cur_bytes = 0;
@@ -832,8 +835,8 @@ cmp_rec_rec_with_match(
 				data_mysql_latin1_swedish_charset_coll)) {
 
 			ret = cmp_whole_field(cur_type,
-						rec1_b_ptr, rec1_f_len,
-						rec2_b_ptr, rec2_f_len);
+					rec1_b_ptr, (unsigned) rec1_f_len,
+					rec2_b_ptr, (unsigned) rec2_f_len);
 			if (ret != 0) {
 				cur_bytes = 0;
 
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index 4c014d39f7a..1ee3f7d380e 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -756,7 +756,7 @@ run_again:
 
 		trx->op_info = "";
 
-		return(err);
+		return((int) err);
 	}
 
 	que_thr_stop_for_mysql_no_error(thr, trx);
@@ -856,7 +856,7 @@ run_again:
 
 		trx->op_info = "";
 
-		return(err);
+		return((int) err);
 	}
 
 	que_thr_stop_for_mysql_no_error(thr, trx);
@@ -972,7 +972,7 @@ run_again:
 
 		trx->op_info = "";
 
-		return(err);
+		return((int) err);
 	}
 
 	que_thr_stop_for_mysql_no_error(thr, trx);
@@ -1222,7 +1222,7 @@ run_again:
 
 		trx->op_info = "";
 
-		return(err);
+		return((int) err);
 	}
 
 	que_thr_stop_for_mysql_no_error(thr, trx);
@@ -1438,7 +1438,7 @@ row_mysql_recover_tmp_table(
 	}
 	else {
 		int	status;
-		int	namelen = strlen(table->name);
+		int	namelen = (int) strlen(table->name);
 		char*	old_name = mem_strdupl(table->name, namelen);
 		/* replace "rsql" with "#sql" */
 		old_name[ptr - table->name + 1] = '#';
@@ -1928,7 +1928,7 @@ row_drop_table_for_mysql_in_background(
 
   	trx_free_for_background(trx);
 
-	return(error);
+	return((int) error);
 }
 
 /*************************************************************************
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c
index 736ca15262c..7a5e4cb9264 100644
--- a/innobase/row/row0sel.c
+++ b/innobase/row/row0sel.c
@@ -3484,10 +3484,10 @@ rec_loop:
 			ut_print_timestamp(stderr);
 			buf_page_print(buf_frame_align(rec));
 			fprintf(stderr,
-"\nInnoDB: rec address %lx, first buffer frame %lx\n"
-"InnoDB: buffer pool high end %lx, buf block fix count %lu\n",
-				(ulong)rec, (ulong)buf_pool->frame_zero,
-				(ulong)buf_pool->high_end,
+"\nInnoDB: rec address %p, first buffer frame %p\n"
+"InnoDB: buffer pool high end %p, buf block fix count %lu\n",
+				rec, buf_pool->frame_zero,
+				buf_pool->high_end,
 				(ulong)buf_block_align(rec)->buf_fix_count);
 			fprintf(stderr,
 "InnoDB: Index corruption: rec offs %lu next offs %lu, page no %lu,\n"
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
index 57166e98f45..68fe6d5079a 100644
--- a/innobase/trx/trx0sys.c
+++ b/innobase/trx/trx0sys.c
@@ -685,7 +685,8 @@ trx_sys_print_mysql_binlog_offset(void)
 {
 	trx_sysf_t*	sys_header;
 	mtr_t		mtr;
-	ulong           trx_sys_mysql_bin_log_pos_high, trx_sys_mysql_bin_log_pos_low;
+	ulint		trx_sys_mysql_bin_log_pos_high;
+	ulint		trx_sys_mysql_bin_log_pos_low;
 
 	mtr_start(&mtr);
 
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c
index dd4da33abb5..ad82560e26c 100644
--- a/innobase/trx/trx0trx.c
+++ b/innobase/trx/trx0trx.c
@@ -274,6 +274,8 @@ trx_free(
 			(ulong)trx->mysql_n_tables_locked);
 
 		trx_print(stderr, trx);		
+
+		ut_print_buf(stderr, (byte*)trx, sizeof(trx_t));
 	}
 
 	ut_a(trx->magic_n == TRX_MAGIC_N);
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c
index 1fffd08c718..1be5939303a 100644
--- a/innobase/ut/ut0ut.c
+++ b/innobase/ut/ut0ut.c
@@ -454,7 +454,7 @@ ut_copy_file(
 			len < (long) sizeof buf ? (size_t) len : sizeof buf;
 		size_t	size = fread(buf, 1, maxs, src);
 		fwrite(buf, 1, size, dest);
-		len -= size;
+		len -= (long) size;
 		if (size < maxs) {
 			break;
 		}
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index 3184cc6644c..2fad2363ae2 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -105,7 +105,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
                  FT_WORD *word, FTB_PARAM *param)
 {
   byte *doc=*start;
-  uint mwc, length;
+  uint mwc, length, mbl;
 
   param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);
   param->plusminus=param->pmsign=0;
@@ -146,7 +146,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
     }
 
     mwc=length=0;
-    for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc))
+    for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))
       if (true_word_char(cs,*doc))
         mwc=0;
       else if (!misc_word_char(*doc) || mwc++)
diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c
index 54b2cc77965..28aac0a8ecf 100644
--- a/myisam/myisam_ftdump.c
+++ b/myisam/myisam_ftdump.c
@@ -44,10 +44,6 @@ static struct my_option my_long_options[] =
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"length", 'l', "Report length distribution.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifdef DISABLED
-  {"execute", 'e', "Execute given query.", (gptr*) &query, (gptr*) &query, 0,
-   GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"help", 'h', "Display help and exit.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"help", '?', "Synonym for -h.",
@@ -108,119 +104,116 @@ int main(int argc,char *argv[])
 
   mi_lock_database(info, F_EXTRA_LCK);
 
-  if (query)
+  info->lastpos= HA_OFFSET_ERROR;
+  info->update|= HA_STATE_PREV_FOUND;
+
+  while (!(error=mi_rnext(info,NULL,inx)))
   {
-#if 0
-    FT_DOCLIST *result;
-    int i;
+    keylen=*(info->lastkey);
 
-    ft_init_stopwords(ft_precompiled_stopwords);
-
-    result=ft_nlq_init_search(info,inx,query,strlen(query),1);
-    if(!result)
-      goto err;
-
-    if (verbose)
-      printf("%d rows matched\n",result->ndocs);
-
-    for(i=0 ; i<result->ndocs ; i++)
-      printf("%9lx %20.7f\n",(ulong)result->doc[i].dpos,result->doc[i].weight);
-
-    ft_nlq_close_search(result);
-#else
-    printf("-e option is disabled\n");
-#endif
-  }
-  else
-  {
-    info->lastpos= HA_OFFSET_ERROR;
-    info->update|= HA_STATE_PREV_FOUND;
-
-    while (!(error=mi_rnext(info,NULL,inx)))
-    {
-      keylen=*(info->lastkey);
-
-      subkeys=ft_sintXkorr(info->lastkey+keylen+1);
-      if (subkeys >= 0)
-        weight=*(float*)&subkeys;
+    subkeys=ft_sintXkorr(info->lastkey+keylen+1);
+    if (subkeys >= 0)
+      weight=*(float*)&subkeys;
 
 #ifdef HAVE_SNPRINTF
-      snprintf(buf,MAX_LEN,"%.*s",(int) keylen,info->lastkey+1);
+    snprintf(buf,MAX_LEN,"%.*s",(int) keylen,info->lastkey+1);
 #else
-      sprintf(buf,"%.*s",(int) keylen,info->lastkey+1);
+    sprintf(buf,"%.*s",(int) keylen,info->lastkey+1);
 #endif
-      my_casedn_str(default_charset_info,buf);
-      total++;
-      lengths[keylen]++;
+    my_casedn_str(default_charset_info,buf);
+    total++;
+    lengths[keylen]++;
 
-      if (count || stats)
+    if (count || stats)
+    {
+      doc_cnt++;
+      if (strcmp(buf, buf2))
       {
-        doc_cnt++;
-        if (strcmp(buf, buf2))
+        if (*buf2)
         {
-          if (*buf2)
+          uniq++;
+          avg_gws+=gws=GWS_IN_USE;
+          if (count)
+            printf("%9u %20.7f %s\n",doc_cnt,gws,buf2);
+          if (maxlen<keylen2)
           {
-            uniq++;
-            avg_gws+=gws=GWS_IN_USE;
-            if (count)
-              printf("%9u %20.7f %s\n",doc_cnt,gws,buf2);
-            if (maxlen<keylen2)
-            {
-              maxlen=keylen2;
-              strmov(buf_maxlen, buf2);
-            }
-            if (max_doc_cnt < doc_cnt)
-            {
-              max_doc_cnt=doc_cnt;
-              strmov(buf_min_gws, buf2);
-              min_gws=gws;
-            }
+            maxlen=keylen2;
+            strmov(buf_maxlen, buf2);
+          }
+          if (max_doc_cnt < doc_cnt)
+          {
+            max_doc_cnt=doc_cnt;
+            strmov(buf_min_gws, buf2);
+            min_gws=gws;
           }
-          strmov(buf2, buf);
-          keylen2=keylen;
-          doc_cnt=0;
         }
+        strmov(buf2, buf);
+        keylen2=keylen;
+        doc_cnt=0;
       }
-      if (dump)
-      {
-        if (subkeys>=0)
-          printf("%9lx %20.7f %s\n", (long) info->lastpos,weight,buf);
-        else
-          printf("%9lx => %17d %s\n",(long) info->lastpos,-subkeys,buf);
-      }
-      if (verbose && (total%HOW_OFTEN_TO_WRITE)==0)
-        printf("%10ld\r",total);
     }
-    mi_lock_database(info, F_UNLCK);
+    if (dump)
+    {
+      if (subkeys>=0)
+        printf("%9lx %20.7f %s\n", (long) info->lastpos,weight,buf);
+      else
+        printf("%9lx => %17d %s\n",(long) info->lastpos,-subkeys,buf);
+    }
+    if (verbose && (total%HOW_OFTEN_TO_WRITE)==0)
+      printf("%10ld\r",total);
+  }
+  mi_lock_database(info, F_UNLCK);
 
-    if (stats)
+  if (count || stats)
+  {
+    doc_cnt++;
+    if (*buf2)
     {
-      count=0;
-      for (inx=0;inx<256;inx++)
+      uniq++;
+      avg_gws+=gws=GWS_IN_USE;
+      if (count)
+        printf("%9u %20.7f %s\n",doc_cnt,gws,buf2);
+      if (maxlen<keylen2)
       {
-        count+=lengths[inx];
-        if ((ulong) count >= total/2)
-          break;
+        maxlen=keylen2;
+        strmov(buf_maxlen, buf2);
+      }
+      if (max_doc_cnt < doc_cnt)
+      {
+        max_doc_cnt=doc_cnt;
+        strmov(buf_min_gws, buf2);
+        min_gws=gws;
       }
-      printf("Total rows: %lu\nTotal words: %lu\n"
-             "Unique words: %lu\nLongest word: %lu chars (%s)\n"
-             "Median length: %u\n"
-             "Average global weight: %f\n"
-             "Most common word: %lu times, weight: %f (%s)\n",
-             (long) info->state->records, total, uniq, maxlen, buf_maxlen,
-             inx, avg_gws/uniq, max_doc_cnt, min_gws, buf_min_gws);
     }
-    if (lstats)
+  }
+
+  if (stats)
+  {
+    count=0;
+    for (inx=0;inx<256;inx++)
     {
-      count=0;
-      for (inx=0; inx<256; inx++)
-      {
-        count+=lengths[inx];
-        if (count && lengths[inx])
-          printf("%3u: %10lu %5.2f%% %20lu %4.1f%%\n", inx,
-		 (ulong) lengths[inx],100.0*lengths[inx]/total,(ulong) count,
-		 100.0*count/total);
-      }
+      count+=lengths[inx];
+      if ((ulong) count >= total/2)
+        break;
+    }
+    printf("Total rows: %lu\nTotal words: %lu\n"
+           "Unique words: %lu\nLongest word: %lu chars (%s)\n"
+           "Median length: %u\n"
+           "Average global weight: %f\n"
+           "Most common word: %lu times, weight: %f (%s)\n",
+           (long) info->state->records, total, uniq, maxlen, buf_maxlen,
+           inx, avg_gws/uniq, max_doc_cnt, min_gws, buf_min_gws);
+  }
+  if (lstats)
+  {
+    count=0;
+    for (inx=0; inx<256; inx++)
+    {
+      count+=lengths[inx];
+      if (count && lengths[inx])
+        printf("%3u: %10lu %5.2f%% %20lu %4.1f%%\n", inx,
+               (ulong) lengths[inx],100.0*lengths[inx]/total,(ulong) count,
+               100.0*count/total);
     }
   }
 
@@ -254,9 +247,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     lstats=1;
     complain(query!=0);
     break;
-  case 'e':
-    complain(dump || count || stats);
-    break;
   case '?':
   case 'h':
     usage();
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 6bcd0715ccd..294c135bcf3 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -20,12 +20,14 @@
 if HAVE_NDBCLUSTER_DB
 SUBDIRS = ndb
 DIST_SUBDIRS=ndb
+USE_NDBCLUSTER=\"--ndbcluster\"
 else
 # If one uses automake conditionals, automake will automatically
 # include all possible branches to DIST_SUBDIRS goal.
 # Reset DIST_SUBDIRS if we don't use NDB
 SUBDIRS=
 DIST_SUBDIRS=
+USE_NDBCLUSTER=\"\"
 endif
 
 benchdir_root=		$(prefix)
@@ -103,6 +105,7 @@ SUFFIXES = .sh
 	  -e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
 	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
 	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
+	  -e 's!@''USE_NDBCLUSTER''@!$(USE_NDBCLUSTER)!g' \
 	  $< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc
index d0c083cab86..ec1a93311fb 100644
--- a/mysql-test/include/have_multi_ndb.inc
+++ b/mysql-test/include/have_multi_ndb.inc
@@ -10,7 +10,7 @@ drop table if exists t1, t2;
 --enable_warnings
 flush tables;
 @r/have_ndb.require show variables like "have_ndbcluster";
-@r/server_id.require show variables like "server_id";
+# @r/server_id.require show variables like "server_id";
 enable_query_log;
 
 # Check that server2 has NDB support
@@ -21,7 +21,7 @@ drop table if exists t1, t2;
 --enable_warnings
 flush tables;
 @r/have_ndb.require show variables like "have_ndbcluster";
-@r/server_id1.require show variables like "server_id";
+# @r/server_id1.require show variables like "server_id";
 enable_query_log;
 
 # Set the default connection to 'server1'
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 653c9bfbaec..ce419540bf2 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1532,6 +1532,7 @@ sub do_before_start_master ($$) {
        $tname ne "rpl_crash_binlog_ib_3b")
   {
     # FIXME we really want separate dir for binlogs
+    # FIXME replace 'rm' in backticks with portable Perl function
     `rm -f $glob_mysql_test_dir/var/log/master-bin*`;
 #    unlink("$glob_mysql_test_dir/var/log/master-bin*");
   }
@@ -1545,8 +1546,12 @@ sub do_before_start_master ($$) {
   # Run master initialization shell script if one exists
   if ( $init_script )
   {
-    # We ignore the return code
-    mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+#      mtr_warning("$init_script exited with code $ret");
+    }
   }
   # for gcov  FIXME needed? If so we need more absolute paths
 # chdir($glob_basedir);
@@ -1563,6 +1568,7 @@ sub do_before_start_slave ($$) {
        $tname ne "rpl_crash_binlog_ib_3b" )
   {
     # FIXME we really want separate dir for binlogs
+    # FIXME replace 'rm' in backticks with portable Perl function
     `rm -fr $glob_mysql_test_dir/var/log/slave*-bin.*`;
 #    unlink("$glob_mysql_test_dir/var/log/slave*-bin.*"); # FIXME idx???
     # FIXME really master?!
@@ -1573,8 +1579,12 @@ sub do_before_start_slave ($$) {
   # Run slave initialization shell script if one exists
   if ( $init_script )
   {
-    # We ignore the return code
-    mtr_run("/bin/sh", ["-c",$init_script], "", "", "", "");
+    my $ret= mtr_run("/bin/sh", [$init_script], "", "", "", "");
+    if ( $ret != 0 )
+    {
+      # FIXME rewrite those scripts to return 0 if successful
+#      mtr_warning("$init_script exited with code $ret");
+    }
   }
 
   `rm -f $glob_mysql_test_dir/var/slave-data/log.*`;
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index da088a1891f..0e60ab4d6fc 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -224,7 +224,7 @@ EXTRA_MYSQL_TEST_OPT=""
 EXTRA_MYSQLDUMP_OPT=""
 EXTRA_MYSQLBINLOG_OPT=""
 USE_RUNNING_SERVER=0
-USE_NDBCLUSTER=""
+USE_NDBCLUSTER=@USE_NDBCLUSTER@
 USE_RUNNING_NDBCLUSTER=""
 USE_PURIFY=""
 PURIFY_LOGS=""
@@ -432,6 +432,11 @@ while test $# -gt 0; do
       TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"`
       VALGRIND="$VALGRIND $TMP"
       ;;
+    --skip-ndbcluster)
+      USE_NDBCLUSTER=""
+      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
+      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1"
+      ;;
     --skip-*)
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1"
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index d9ef306d9f6..34d1213d1b2 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -130,6 +130,9 @@ a	b
 select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);
 a	b
 MySQL has now support	for full-text search
+select * from t1 where MATCH a,b AGAINST ('"now   support"' IN BOOLEAN MODE);
+a	b
+MySQL has now support	for full-text search
 select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);
 a	b
 MySQL has now support	for full-text search
@@ -151,8 +154,6 @@ a	b
 select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);
 a	b
 Full-text indexes	are called collections
-select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
-a	b
 select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE);
 a	b
 Full-text search in MySQL	implements vector space model
diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/r/fulltext_order_by.result
index c6c42fa2e8b..dc51454f1d5 100644
--- a/mysql-test/r/fulltext_order_by.result
+++ b/mysql-test/r/fulltext_order_by.result
@@ -62,6 +62,14 @@ a	rel
 6	0
 4	1
 7	1
+alter table t1 add key m (message);
+explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	fulltext	message	message	0		1	Using where; Using filesort
+SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
+message
+steve is cool
+steve
 drop table t1;
 CREATE TABLE t1 (
 a INT AUTO_INCREMENT PRIMARY KEY,
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index ac7f182b4c4..3c99e22cb10 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -567,3 +567,35 @@ UNLOCK TABLES;
 
 DROP TABLE t1;
 DROP TABLE t2;
+CREATE TABLE t1 (`b` blob);
+INSERT INTO `t1` VALUES (0x602010000280100005E71A);
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `b` blob
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+LOCK TABLES `t1` WRITE;
+INSERT INTO `t1` VALUES (0x602010000280100005E71A);
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP TABLE t1;
diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/r/ndb_alter_table.result
index 2aab46014a9..9bc82e7a24a 100644
--- a/mysql-test/r/ndb_alter_table.result
+++ b/mysql-test/r/ndb_alter_table.result
@@ -170,3 +170,17 @@ c
 4
 5
 drop table t1;
+create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
+engine=ndb;
+insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
+create index c on t1(c);
+select * from t1 where b = 'two';
+a	b	c
+2	two	two
+alter table t1 drop index c;
+select * from t1 where b = 'two';
+ERROR 42S02: Table 'test.t1' doesn't exist
+select * from t1 where b = 'two';
+a	b	c
+2	two	two
+drop table t1;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 4809f6f0357..2acf69dad76 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -59,6 +59,7 @@ select * from t1 where MATCH a,b AGAINST ("+call* +coll*" IN BOOLEAN MODE);
 
 select * from t1 where MATCH a,b AGAINST ('"support now"' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);
+select * from t1 where MATCH a,b AGAINST ('"now   support"' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
@@ -68,7 +69,6 @@ select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
 select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);
-select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
 
 # bug#2708, bug#3870 crash
 
diff --git a/mysql-test/t/fulltext_order_by.test b/mysql-test/t/fulltext_order_by.test
index 5856f68ec9e..5c1b4127d8c 100644
--- a/mysql-test/t/fulltext_order_by.test
+++ b/mysql-test/t/fulltext_order_by.test
@@ -31,6 +31,14 @@ SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a=7 an
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel;
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel;
 
+#
+# BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
+# for fulltext searches too
+#
+alter table t1 add key m (message);
+explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
+SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
+
 drop table t1;
 
 #
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index be24c380e0d..89f578dbb20 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -183,3 +183,13 @@ INSERT INTO t2 VALUES (4),(5),(6);
 --exec $MYSQL_DUMP --skip-comments --ignore-table=test.t1 test
 DROP TABLE t1;
 DROP TABLE t2;
+
+#
+#  Bug  #8830
+#
+
+CREATE TABLE t1 (`b` blob);
+INSERT INTO `t1` VALUES (0x602010000280100005E71A);
+--exec $MYSQL_DUMP --skip-extended-insert --hex-blob test --skip-comments t1
+DROP TABLE t1;
+
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test
index 3544a50c3e1..2edb358d386 100644
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -1,4 +1,5 @@
 -- source include/have_ndb.inc
+-- source include/have_multi_ndb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -137,6 +138,21 @@ INSERT INTO t1 VALUES (1,2,0),(18,19,4),(20,21,0);
 select c from t1 order by c;
 drop table t1;
 
+create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )
+engine=ndb;
+insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');
+create index c on t1(c); 
+connection server2;
+select * from t1 where b = 'two';
+connection server1;
+alter table t1 drop index c;
+connection server2;
+--error 1146
+select * from t1 where b = 'two';
+select * from t1 where b = 'two';
+connection server1;
+drop table t1;
+
 #--disable_warnings
 #DROP TABLE IF EXISTS t2;
 #--enable_warnings
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 1d98204ff8e..c0eb6f15548 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -28,8 +28,8 @@
     * when both arguments are bitmaps, they must be of the same size
     * bitmap_intersect() is an exception :)
       (for for Bitmap::intersect(ulonglong map2buff))
-  
-  If THREAD is defined all bitmap operations except bitmap_init/bitmap_free 
+
+  If THREAD is defined all bitmap operations except bitmap_init/bitmap_free
   are thread-safe.
 
   TODO:
@@ -40,7 +40,6 @@
 #include <my_bitmap.h>
 #include <m_string.h>
 
-
 static inline void bitmap_lock(MY_BITMAP *map)
 {
 #ifdef THREAD
@@ -49,7 +48,6 @@ static inline void bitmap_lock(MY_BITMAP *map)
 #endif
 }
 
-
 static inline void bitmap_unlock(MY_BITMAP *map)
 {
 #ifdef THREAD
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c
index 80dca7d56ac..603248e186b 100644
--- a/mysys/my_symlink2.c
+++ b/mysys/my_symlink2.c
@@ -45,7 +45,7 @@ File my_create_with_symlink(const char *linkname, const char *filename,
   else
   {
     if (linkname)
-      my_realpath(&abs_linkname, linkname, MYF(0));
+      my_realpath(abs_linkname, linkname, MYF(0));
     create_link= (linkname && strcmp(abs_linkname,filename));
   }
 
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 3806f553b3a..524a40697bf 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -103,8 +103,22 @@ void Ndbcntr::execCONTINUEB(Signal* signal)
     }
     
     Uint64 now = NdbTick_CurrentMillisecond();
-    if(now > c_start.m_startFailureTimeout){
-      ndbrequire(false);
+    if(now > c_start.m_startFailureTimeout)
+    {
+      jam();
+      Uint32 to_3= 0;
+      const ndb_mgm_configuration_iterator * p = 
+	theConfiguration.getOwnConfigIterator();
+      ndb_mgm_get_int_parameter(p, CFG_DB_START_FAILURE_TIMEOUT, &to_3);
+      BaseString tmp;
+      tmp.append("Shutting down node as total restart time exceeds "
+		 " StartFailureTimeout as set in config file ");
+      if(to_3 == 0)
+	tmp.append(" 0 (inifinite)");
+      else
+	tmp.appfmt(" %d", to_3);
+      
+      progError(__LINE__, ERR_SYSTEM_ERROR, tmp.c_str());
     }
     
     signal->theData[0] = ZSTARTUP;
@@ -413,7 +427,7 @@ inline
 Uint64
 setTimeout(Uint64 time, Uint32 timeoutValue){
   if(timeoutValue == 0)
-    return ~0;
+    return ~(Uint64)0;
   return time + timeoutValue;
 }
 
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 0e28d27ee43..ddce55c063d 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -66,7 +66,7 @@ esac
 mkdir $BASE $BASE/bin $BASE/docs \
  $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
  $BASE/mysql-test $BASE/mysql-test/t  $BASE/mysql-test/r \
- $BASE/mysql-test/include $BASE/mysql-test/std_data
+ $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib
 
 if [ $BASE_SYSTEM != "netware" ] ; then
  mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
@@ -206,7 +206,7 @@ $CP -r sql/share/* $MYSQL_SHARE
 rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD
 
 for i in mysql-test/mysql-test-run mysql-test/install_test_db \
-         mysql-test/README \
+         mysql-test/mysql-test-run.pl mysql-test/README \
          netware/mysql_test_run.nlm netware/install_test_db.ncf
 do
   if [ -f $i ]
@@ -215,6 +215,8 @@ do
    fi
 done
 
+$CP mysql-test/lib/*.pl  $BASE/mysql-test/lib
+$CP mysql-test/lib/*.sql $BASE/mysql-test/lib
 $CP mysql-test/include/*.inc $BASE/mysql-test/include
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
diff --git a/scripts/make_win_binary_distribution.sh b/scripts/make_win_binary_distribution.sh
index 9b2cc2d7d22..c611454450c 100644
--- a/scripts/make_win_binary_distribution.sh
+++ b/scripts/make_win_binary_distribution.sh
@@ -110,6 +110,10 @@ print_debug "Copying sql-bench to $DIRNAME/bench"
 mkdir $DIRNAME/bench
 cp -fr sql-bench/* $DIRNAME/bench
 
+print_debug "Copying mysql-test to $DIRNAME/mysql-test"
+mkdir $DIRNAME/mysql-test
+cp -fr mysql-test/* $DIRNAME/mysql-test
+
 print_debug "Copying support-files to $DIRNAME"
 cp support-files/* $DIRNAME
 
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 8883021abcc..101007554a3 100644
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -255,7 +255,7 @@ make -C $SOURCE/ndb windoze
 # Input directories to be copied recursively
 #
 
-for i in bdb innobase mysql-test ndb
+for i in bdb innobase ndb
 do
   copy_dir_dirs $i
 done
@@ -307,7 +307,7 @@ done
 # Raw dirs from source tree
 #
 
-for i in scripts sql-bench SSL tests
+for i in scripts sql-bench mysql-test SSL tests
 do
   print_debug "Copying directory '$i'"
   if [ -d $i ]
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index b5884b17093..7dc7da4dad6 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -489,8 +489,6 @@ int ha_heap::create(const char *name, TABLE *table_arg,
     default:
       DBUG_ASSERT(0); // cannot happen
     }
-    keydef[key].algorithm= ((pos->algorithm == HA_KEY_ALG_UNDEF) ?
-			    HA_KEY_ALG_HASH : pos->algorithm);
 
     for (; key_part != key_part_end; key_part++, seg++)
     {
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 2f755f842ac..e0ce50e01f7 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -411,6 +411,35 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
     #   The mapped error code
 */
 
+void ha_ndbcluster::invalidateDictionaryCache()
+{
+  NDBDICT *dict= get_ndb()->getDictionary();
+  DBUG_PRINT("info", ("invalidating %s", m_tabname));
+  dict->invalidateTable(m_tabname);
+  table->version=0L;			/* Free when thread is ready */
+  /* Invalidate indexes */
+  for (uint i= 0; i < table->keys; i++)
+  {
+    NDBINDEX *index = (NDBINDEX *) m_index[i].index;
+    NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index;
+    NDB_INDEX_TYPE idx_type= m_index[i].type;
+
+    switch(idx_type) {
+    case(PRIMARY_KEY_ORDERED_INDEX):
+    case(ORDERED_INDEX):
+      dict->invalidateIndex(index->getName(), m_tabname);
+      break;      
+    case(UNIQUE_ORDERED_INDEX):
+      dict->invalidateIndex(index->getName(), m_tabname);
+    case(UNIQUE_INDEX):
+      dict->invalidateIndex(unique_index->getName(), m_tabname);
+      break;
+    case(PRIMARY_KEY_INDEX):
+    case(UNDEFINED_INDEX):
+      break;
+    }
+  }
+}
 
 int ha_ndbcluster::ndb_err(NdbTransaction *trans)
 {
@@ -421,14 +450,8 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
   ERR_PRINT(err);
   switch (err.classification) {
   case NdbError::SchemaError:
-  {
-    Ndb *ndb= get_ndb();
-    NDBDICT *dict= ndb->getDictionary();
-    DBUG_PRINT("info", ("invalidateTable %s", m_tabname));
-    dict->invalidateTable(m_tabname);
-    table->s->version= 0L;              /* Free when thread is ready */
+    invalidateDictionaryCache();
     break;
-  }
   default:
     break;
   }
@@ -855,7 +878,7 @@ int ha_ndbcluster::get_metadata(const char *path)
       if (!invalidating_ndb_table)
       {
         DBUG_PRINT("info", ("Invalidating table"));
-        dict->invalidateTable(m_tabname);
+        invalidateDictionaryCache();
         invalidating_ndb_table= TRUE;
       }
       else
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 7c4a19c6ec4..d12ff5bcdce 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -554,6 +554,7 @@ private:
   void print_results();
 
   ulonglong get_auto_increment();
+  void invalidateDictionaryCache();
   int ndb_err(NdbTransaction*);
   bool uses_blob_value(bool all_fields);
 
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 03aa56128ca..298418e1574 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1669,9 +1669,8 @@ String *Item_func_format::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
   double nr= args[0]->val_real();
+  uint32 length,str_length,dec;
   int diff;
-  uint32 length, str_length;
-  uint dec;
   if ((null_value=args[0]->null_value))
     return 0; /* purecov: inspected */
   dec= decimals ? decimals+1 : 0;
@@ -1687,12 +1686,12 @@ String *Item_func_format::val_str(String *str)
   if (str_length >= dec+4)
   {
     char *tmp,*pos;
-    length= str->length()+(diff=(str_length- dec-1)/3);
+    length= str->length()+(diff=((int)(str_length- dec-1))/3);
     str= copy_if_not_alloced(&tmp_str,str,length);
     str->length(length);
     tmp= (char*) str->ptr()+length - dec-1;
     for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)
-      pos[0]= pos[-(int) diff];
+      pos[0]= pos[-diff];
     while (diff)
     {
       *pos= *(pos - diff);
diff --git a/sql/log.cc b/sql/log.cc
index d5c7cd5464f..9bd1865fc4f 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -360,12 +360,6 @@ MYSQL_LOG::MYSQL_LOG()
   bzero((char*) &index_file, sizeof(index_file));
 }
 
-
-MYSQL_LOG::~MYSQL_LOG()
-{
-  cleanup();
-}
-
 /* this is called only once */
 
 void MYSQL_LOG::cleanup()
@@ -1276,8 +1270,7 @@ bool MYSQL_LOG::is_active(const char *log_file_name_arg)
 
   SYNOPSIS
     new_file()
-    need_lock		Set to 1 (default) if caller has not locked
-			LOCK_log and LOCK_index
+    need_lock		Set to 1 if caller has not locked LOCK_log
 
   NOTE
     The new file name is stored last in the index file
@@ -1764,12 +1757,13 @@ err:
 
 void MYSQL_LOG::rotate_and_purge(uint flags)
 {
+  if (!(flags & RP_LOCK_LOG_IS_ALREADY_LOCKED))
+    pthread_mutex_lock(&LOCK_log);
   if ((flags & RP_FORCE_ROTATE) ||
       (my_b_tell(&log_file) >= (my_off_t) max_size))
   {
-    new_file(!(flags & RP_LOCK_LOG_IS_ALREADY_LOCKED));
+    new_file(0);
 #ifdef HAVE_REPLICATION
-    // QQ why do we need #ifdef here ???
     if (expire_logs_days)
     {
       long purge_time= time(0) - expire_logs_days*24*60*60;
@@ -1778,6 +1772,8 @@ void MYSQL_LOG::rotate_and_purge(uint flags)
     }
 #endif
   }
+  if (!(flags & RP_LOCK_LOG_IS_ALREADY_LOCKED))
+    pthread_mutex_unlock(&LOCK_log);
 }
 
 uint MYSQL_LOG::next_file_id()
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2c1451a95a4..8e5668e684a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1462,7 +1462,8 @@ void close_connection(THD *thd, uint errcode, bool lock)
 		      errcode ? ER(errcode) : ""));
   if (lock)
     (void) pthread_mutex_lock(&LOCK_thread_count);
-  if ((vio=thd->net.vio) != 0)
+  thd->killed= THD::KILL_CONNECTION;
+  if ((vio= thd->net.vio) != 0)
   {
     if (errcode)
       net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */
@@ -3148,9 +3149,9 @@ we force server id to 2, but this MySQL server will not act as a slave.");
   create_maintenance_thread();
 
   sql_print_information(ER(ER_READY),my_progname,server_version,
-	                ((unix_sock == INVALID_SOCKET) ? (char*) ""
+                        ((unix_sock == INVALID_SOCKET) ? (char*) ""
                                                        : mysqld_unix_port),
-	                 mysqld_port,
+                         mysqld_port,
                          MYSQL_COMPILATION_COMMENT);
 
 #if defined(__NT__) || defined(HAVE_SMEM)
diff --git a/sql/protocol.cc b/sql/protocol.cc
index a05f4c6079b..71908d2a958 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -60,7 +60,7 @@ void net_send_error(THD *thd, uint sql_errno, const char *err)
   char buff[MYSQL_ERRMSG_SIZE+2], *pos;
 #endif
   NET *net= &thd->net;
-  bool generate_warning= 1;
+  bool generate_warning= thd->killed != THD::KILL_CONNECTION;
   DBUG_ENTER("net_send_error");
   DBUG_PRINT("enter",("sql_errno: %d  err: %s", sql_errno,
 		      err ? err : net->last_error[0] ?
@@ -252,8 +252,9 @@ net_printf_error(THD *thd, uint errcode, ...)
   strmake(net->last_error, text_pos, length);
   strmake(net->sqlstate, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH);
 #endif
-  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode,
-	       text_pos ? text_pos : ER(errcode));
+  if (thd->killed != THD::KILL_CONNECTION)
+    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode,
+                 text_pos ? text_pos : ER(errcode));
   thd->is_fatal_error=0;			// Error message is given
   DBUG_VOID_RETURN;
 }
diff --git a/sql/slave.cc b/sql/slave.cc
index ef88f103b63..73dd0fd13c3 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2558,6 +2558,7 @@ st_relay_log_info::~st_relay_log_info()
   pthread_cond_destroy(&start_cond);
   pthread_cond_destroy(&stop_cond);
   pthread_cond_destroy(&log_space_cond);
+  relay_log.cleanup();
 }
 
 /*
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index bac3e42ed62..e8879e8c66f 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1781,7 +1781,11 @@ void TMP_TABLE_PARAM::init()
 
 void thd_increment_bytes_sent(ulong length)
 {
-  current_thd->status_var.bytes_sent+= length;
+  THD *thd=current_thd;
+  if (likely(thd))
+  { /* current_thd==0 when close_connection() calls net_send_error() */
+    thd->status_var.bytes_sent+= length;
+  }
 }
 
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index fa2bcc4d478..e185631f5d6 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -236,7 +236,11 @@ class MYSQL_LOG: public TC_LOG
 
 public:
   MYSQL_LOG();
-  ~MYSQL_LOG();
+  /*
+    note that there's no destructor ~MYSQL_LOG() !
+    The reason is that we don't want it to be automatically called
+    on exit() - but only during the correct shutdown process
+  */
 
   int open(const char *opt_name);
   void close();
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 76d8ec1740a..169e990e879 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -10421,7 +10421,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
   {
     ref_key=	   tab->ref.key;
     ref_key_parts= tab->ref.key_parts;
-    if (tab->type == JT_REF_OR_NULL)
+    if (tab->type == JT_REF_OR_NULL || tab->type == JT_FT)
       DBUG_RETURN(0);
   }
   else if (select && select->quick)		// Range found by opt_range