From 42e7849bb8c684578852b1d34e12cfd1d1e870f5 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Fri, 4 Mar 2005 19:16:14 +0100 Subject: [PATCH 01/29] typo fixed --- myisam/mi_create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myisam/mi_create.c b/myisam/mi_create.c index d07179f1799..19abb9ca745 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -522,7 +522,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, if (share.base.raid_type) { (void) fn_format(filename,name,"",MI_NAME_DEXT,2+4); - if ((dfile=my_raid_create(filename, 0, create_mode + if ((dfile=my_raid_create(filename, 0, create_mode, share.base.raid_type, share.base.raid_chunks, share.base.raid_chunksize, From 79ac22e324229d91ce32e0327a874d8e981905fb Mon Sep 17 00:00:00 2001 From: "Sinisa@sinisa.nasamreza.org" <> Date: Sat, 5 Mar 2005 22:06:07 +0200 Subject: [PATCH 02/29] A fix for a bug #8830, which occured when binary data from blob was dumped with --hex-blob and --skip-extended-insert options. --- .bzrignore | 1 + client/mysqldump.c | 2 +- mysql-test/r/mysqldump.result | 46 +++++++++++++++++++++++++++++++++++ mysql-test/t/mysqldump.test | 10 ++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index faedfa2b48e..d19b005a03e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1052,3 +1052,4 @@ ndb/tools/ndb_drop_index.dsp ndb/tools/ndb_show_tables.dsp ndb/tools/ndb_select_all.dsp ndb/tools/ndb_select_count.dsp +support-files/ndb-config-2-node.ini diff --git a/client/mysqldump.c b/client/mysqldump.c index 2c0bdf9a7a9..a53dc319b2e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1790,7 +1790,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/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index f763a16836f..a52749a1a93 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -549,3 +549,49 @@ UNLOCK TABLES; DROP TABLE t1; DROP TABLE t2; +CREATE TABLE t1 (`b` blob); +INSERT INTO `t1` VALUES (0x602010000280100005E71A); +-- MySQL dump 10.9 +-- +-- Host: localhost Database: test +-- ------------------------------------------------------ +-- Server version 4.1.11-debug-log + +/*!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 */; + +-- +-- Table structure for table `t1` +-- + +DROP TABLE IF EXISTS `t1`; +CREATE TABLE `t1` ( + `b` blob +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `t1` +-- + + +/*!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/t/mysqldump.test b/mysql-test/t/mysqldump.test index 255ae50a8ca..48f6ed9d0c1 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -165,3 +165,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 t1 +DROP TABLE t1; + From 2b447eceb1e7e504da0127160c7041634619f2bf Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Sun, 6 Mar 2005 12:31:40 +0100 Subject: [PATCH 03/29] myisam/ft_parser.c protection against invalid string in ft_get_word mysys/my_symlink2.c typo fixed --- myisam/ft_parser.c | 4 ++-- mysys/my_symlink2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 543cf998a82..0b1e68b0d70 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -103,7 +103,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; @@ -144,7 +144,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, } mwc=length=0; - for (word->pos=doc; docpos=doc; doc Date: Sun, 6 Mar 2005 14:22:28 +0100 Subject: [PATCH 04/29] New Project files for Windows Ithanium 64-bit builds --- BitKeeper/etc/logging_ok | 1 + VC++Files/client/mysql_ia64.dsp | 136 ++ VC++Files/client/mysqladmin_ia64.dsp | 124 + VC++Files/client/mysqlcheck_ia64.dsp | 77 + VC++Files/client/mysqlclient_ia64.dsp | 570 +++++ VC++Files/client/mysqldump_ia64.dsp | 136 ++ VC++Files/client/mysqlimport_ia64.dsp | 124 + VC++Files/client/mysqlshow_ia64.dsp | 124 + VC++Files/client/mysqltest_ia64.dsp | 196 ++ VC++Files/comp_err/comp_err_ia64.dsp | 92 + VC++Files/dbug/dbug_ia64.dsp | 125 + VC++Files/heap/heap_ia64.dsp | 256 +++ VC++Files/innobase/innobase_ia64.dsp | 450 ++++ VC++Files/isam/isam_ia64.dsp | 260 +++ VC++Files/isamchk/isamchk_ia64.dsp | 100 + VC++Files/libmysql/libmysql_ia64.dsp | 544 +++++ .../examples/test_libmysqld_ia64.dsp | 80 + VC++Files/libmysqld/libmysqld_ia64.dsp | 581 +++++ .../libmysqltest/myTest-package_ia64.dsp | 92 + VC++Files/libmysqltest/myTest_ia64.dsp | 94 + VC++Files/merge/merge_ia64.dsp | 134 ++ .../my_print_defaults_ia64.dsp | 132 ++ VC++Files/myisam/myisam_ia64.dsp | 366 +++ .../myisam_ftdump/myisam_ftdump_ia64.dsp | 105 + VC++Files/myisamchk/myisamchk_ia64.dsp | 136 ++ VC++Files/myisamlog/myisamlog_ia64.dsp | 138 ++ VC++Files/myisammrg/myisammrg_ia64.dsp | 233 ++ VC++Files/myisampack/myisampack_ia64.dsp | 138 ++ .../mysql-test/mysql_test_run_new_ia64.dsp | 140 ++ VC++Files/mysql_ia64.dsw | 884 ++++++++ VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp | 139 ++ VC++Files/mysqlcheck/mysqlcheck_ia64.dsp | 132 ++ VC++Files/mysqldemb/mysqldemb_ia64.dsp | 447 ++++ VC++Files/mysqlmanager/MySqlManager_ia64.dsp | 276 +++ VC++Files/mysqlserver/mysqlserver_ia64.dsp | 84 + VC++Files/mysqlshutdown/myshutdown_ia64.dsp | 101 + .../mysqlshutdown/mysqlshutdown_ia64.dsp | 119 + VC++Files/mysqlwatch/mysqlwatch_ia64.dsp | 71 + VC++Files/mysys/mysys_ia64.dsp | 619 +++++ VC++Files/pack_isam/pack_isam_ia64.dsp | 133 ++ VC++Files/perror/perror_ia64.dsp | 140 ++ VC++Files/regex/regex_ia64.dsp | 114 + VC++Files/replace/replace_ia64.dsp | 125 + VC++Files/sql/mysqld_ia64.dsp | 2013 +++++++++++++++++ VC++Files/sql/mysqldmax_ia64.dsp | 1542 +++++++++++++ VC++Files/strings/strings_ia64.dsp | 266 +++ VC++Files/test1/test1_ia64.dsp | 103 + VC++Files/tests/mysql_client_test_ia64.dsp | 62 + VC++Files/thr_test/thr_test_ia64.dsp | 106 + VC++Files/vio/vio_ia64.dsp | 108 + VC++Files/zlib/zlib_ia64.dsp | 204 ++ 51 files changed, 13472 insertions(+) create mode 100644 VC++Files/client/mysql_ia64.dsp create mode 100644 VC++Files/client/mysqladmin_ia64.dsp create mode 100644 VC++Files/client/mysqlcheck_ia64.dsp create mode 100644 VC++Files/client/mysqlclient_ia64.dsp create mode 100644 VC++Files/client/mysqldump_ia64.dsp create mode 100644 VC++Files/client/mysqlimport_ia64.dsp create mode 100644 VC++Files/client/mysqlshow_ia64.dsp create mode 100644 VC++Files/client/mysqltest_ia64.dsp create mode 100644 VC++Files/comp_err/comp_err_ia64.dsp create mode 100644 VC++Files/dbug/dbug_ia64.dsp create mode 100644 VC++Files/heap/heap_ia64.dsp create mode 100644 VC++Files/innobase/innobase_ia64.dsp create mode 100644 VC++Files/isam/isam_ia64.dsp create mode 100644 VC++Files/isamchk/isamchk_ia64.dsp create mode 100644 VC++Files/libmysql/libmysql_ia64.dsp create mode 100644 VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp create mode 100644 VC++Files/libmysqld/libmysqld_ia64.dsp create mode 100644 VC++Files/libmysqltest/myTest-package_ia64.dsp create mode 100644 VC++Files/libmysqltest/myTest_ia64.dsp create mode 100644 VC++Files/merge/merge_ia64.dsp create mode 100644 VC++Files/my_print_defaults/my_print_defaults_ia64.dsp create mode 100644 VC++Files/myisam/myisam_ia64.dsp create mode 100644 VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp create mode 100644 VC++Files/myisamchk/myisamchk_ia64.dsp create mode 100644 VC++Files/myisamlog/myisamlog_ia64.dsp create mode 100644 VC++Files/myisammrg/myisammrg_ia64.dsp create mode 100644 VC++Files/myisampack/myisampack_ia64.dsp create mode 100644 VC++Files/mysql-test/mysql_test_run_new_ia64.dsp create mode 100644 VC++Files/mysql_ia64.dsw create mode 100644 VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp create mode 100644 VC++Files/mysqlcheck/mysqlcheck_ia64.dsp create mode 100644 VC++Files/mysqldemb/mysqldemb_ia64.dsp create mode 100644 VC++Files/mysqlmanager/MySqlManager_ia64.dsp create mode 100644 VC++Files/mysqlserver/mysqlserver_ia64.dsp create mode 100644 VC++Files/mysqlshutdown/myshutdown_ia64.dsp create mode 100644 VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp create mode 100644 VC++Files/mysqlwatch/mysqlwatch_ia64.dsp create mode 100644 VC++Files/mysys/mysys_ia64.dsp create mode 100644 VC++Files/pack_isam/pack_isam_ia64.dsp create mode 100644 VC++Files/perror/perror_ia64.dsp create mode 100644 VC++Files/regex/regex_ia64.dsp create mode 100644 VC++Files/replace/replace_ia64.dsp create mode 100644 VC++Files/sql/mysqld_ia64.dsp create mode 100644 VC++Files/sql/mysqldmax_ia64.dsp create mode 100644 VC++Files/strings/strings_ia64.dsp create mode 100644 VC++Files/test1/test1_ia64.dsp create mode 100644 VC++Files/tests/mysql_client_test_ia64.dsp create mode 100644 VC++Files/thr_test/thr_test_ia64.dsp create mode 100644 VC++Files/vio/vio_ia64.dsp create mode 100644 VC++Files/zlib/zlib_ia64.dsp diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a04676ef503..9749be3448e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -45,6 +45,7 @@ dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com georg@beethoven.local +georg@lmy002.wdf.sap.corp gerberb@ou800.zenez.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru 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..1669b1bad72 --- /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.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.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: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 /machine:IX86 /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 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 /machine:IX86 /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 /machine:IX86 /out:"../client_release/mysqladmin.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 /machine:IX86 /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..27b8ed47062 --- /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.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.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: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 mysys.lib /nologo /subsystem:console /machine:IX86 /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: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 mysys.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../client_release/mysqldump.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 mysys.lib /nologo /subsystem:console /machine:IX86 /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..35d9e6e9f64 --- /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 - Win32IAg4 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.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.mak" CFG="mysqlimport - Win32IAg4 classic" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mysqlimport - Win32IAg4 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "mysqlimport - Win32IAg4 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "mysqlimport - Win32IAg4 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 - Win32IAg4 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: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 /machine:IX86 /out:"../client_release/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64 + +!ELSEIF "$(CFG)" == "mysqlimport - Win32IAg4 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: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 setargv.obj /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/mysqlimport.exe" /libpath:"..\lib_debug\\" /machine:IA64 + +!ELSEIF "$(CFG)" == "mysqlimport - Win32IAg4 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 /machine:IX86 /out:"../client_release/mysqlimport.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 /machine:IX86 /out:"../client_classic/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64 + +!ENDIF + +# Begin Target + +# Name "mysqlimport - Win32IAg4 Release" +# Name "mysqlimport - Win32IAg4 Debug" +# Name "mysqlimport - Win32IAg4 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..8b02a03707b --- /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.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.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: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 /machine:IX86 /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: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 /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../client_release/mysqlshow.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 /machine:IX86 /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..f43444f686c --- /dev/null +++ b/VC++Files/client/mysqltest_ia64.dsp @@ -0,0 +1,196 @@ +# 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.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.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" /GZ /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 /machine:I386 /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\" +# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\" +# 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 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 /machine:I386 /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\" +# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console /machine:I386 /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\" +# 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" /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 /machine:I386 /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\" +# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /subsystem:console /machine:I386 /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\" +# 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..f7f30094803 --- /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.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.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 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 /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:IX86 /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 ..\lib_release\mysys.lib wsock32.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..f019705cb5b --- /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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 /machine:IX86 /out:"../client_release/isamchk.exe" /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 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..1584e6f567e --- /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.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.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:IX86 /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 /nologo /subsystem:windows /dll /machine:IX86 /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 /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:IX86 /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..9391346d518 --- /dev/null +++ b/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp @@ -0,0 +1,80 @@ +# 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.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.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" /YX /FD /G2 /EHsc /Wp64 /Zm600 /c +# SUBTRACT CPP /WX /Fr +# 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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..f47936371d6 --- /dev/null +++ b/VC++Files/libmysqld/libmysqld_ia64.dsp @@ -0,0 +1,581 @@ +# 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.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.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:IX86 /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\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 /machine:IX86 /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 /GZ /G2 /EHsc /Wp64 /Zm600 /c +# SUBTRACT CPP /X /Fr +# 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 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_tls.lib ..\lib_debug\mysys_tls.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap_tls.lib ..\lib_debug\innodb.lib /nologo /dll /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /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\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 /machine:IX86 /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 /machine:IX86 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /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\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 /machine:IX86 /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..9b603082535 --- /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.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 - 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 /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..ed52d8363bb --- /dev/null +++ b/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp @@ -0,0 +1,132 @@ +# 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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 /RTC1 /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 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 /incremental:no /debug /machine:IX86 /nodefaultlib:"LIBCMTD.lib" /out:"../client_debug/my_print_defaults.exe" /machine:IA64 + +!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 /machine:IX86 /out:"../client_release/my_print_defaults.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 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\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..16d6f8253dc --- /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.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.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:IX86 /machine:IA64 +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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 kernel32.lib user32.lib wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj ..\lib_debug\zlib.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/myisam_ftdump.exe" t /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..026cb31e2b8 --- /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.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.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:IX86 /machine:IA64 +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /machine:IX86 /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 kernel32.lib user32.lib wsock32.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 /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../client_release/myisamchk.exe" /machine:IA64 +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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..6025f82d3fd --- /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.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.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:IX86 /machine:IA64 +# ADD 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" /machine:IX86 /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 kernel32.lib user32.lib wsock32.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 /incremental:no /pdb:"debug/myisamchk.pdb" /debug /machine:IX86 /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" /machine:IX86 /out:"../client_release/myisamlog.exe" /machine:IA64 +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:"release/myisamchk.pdb" /machine:IX86 /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..e482e243220 --- /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.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.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 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /machine:IX86 /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 kernel32.lib user32.lib wsock32.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 /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../client_release/myisampack.exe" /machine:IA64 +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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..fc7e274b5be --- /dev/null +++ b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp @@ -0,0 +1,140 @@ +# 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.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.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 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 /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" +# 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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" +# 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 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 /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" +# 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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" t +# 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..a7368d09da6 --- /dev/null +++ b/VC++Files/mysql_ia64.dsw @@ -0,0 +1,884 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "MySqlManager"=".\mysqlmanager\MySqlManager_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name mysqlclient_ia64 + End Project Dependency +}}} + +############################################################################### + +Project: "bdb"=".\bdb\bdb_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: "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"=".\myisam\myisam_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + 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: "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: "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: "mysqlclient"=".\client\mysqlclient_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency +}}} + +############################################################################### + +Project: "mysqld"=".\sql\mysqld_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name heap_ia64 + End Project Dependency + Begin Project Dependency + Project_Dep_Name isam_ia64 + End Project Dependency + Begin Project Dependency + Project_Dep_Name merge_ia64 + End Project Dependency + Begin Project Dependency + Project_Dep_Name mysys_ia64 + End Project Dependency + Begin Project Dependency + Project_Dep_Name regex_ia64 + End Project Dependency + Begin Project Dependency + Project_Dep_Name strings_ia64 + 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 bdb + 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: "mysys"=".\mysys\mysys_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: "regex"=".\regex\regex_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +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: "strings"=".\strings\strings_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "test1"=".\test1\test1_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmysql + End Project Dependency +}}} + +############################################################################### + +Project: "test_libmysqld"=".\libmysqld\examples\test_libmysqld_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmysqld + End Project Dependency + Begin Project Dependency + Project_Dep_Name zlib + 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 +}}} + +############################################################################### + +Project: "vio"=".\vio\vio_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "zlib"=".\zlib\zlib_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "mysqltest"=.\client\mysqltest_ia64.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + + +Package=<4> +{{{ Begin Project Dependency + Project_Dep_Name libmysql + End Project Dependency + Begin Project Dependency + Project_Dep_Name mysys + End Project Dependency + Begin Project Dependency + Project_Dep_Name regex + End Project Dependency +}}} + +############################################################################### + +Project: "mysql_client_test"=.\tests\mysql_client_test_ia64.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + + +Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ Begin Project Dependency + Project_Dep_Name mysqltest + End Project Dependency + Begin Project Dependency + Project_Dep_Name mysqladmin + End Project Dependency + Begin Project Dependency + Project_Dep_Name mysql_client_test + 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..b8ec68ff1e1 --- /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.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.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: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 /machine:IX86 /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 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 /machine:IX86 /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 /machine:IX86 /out:"../client_release/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# 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 /machine:IX86 /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..f97f5e07bcf --- /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.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 - 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: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 /machine:IX86 /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 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 /machine:IX86 /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 /machine:IX86 /out:"../client_release/mysqlcheck.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 /machine:IX86 /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..98ead530497 --- /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:IX86 /machine:IA64 +# ADD LINK32 /nologo /subsystem:windows /machine:IX86 /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:IX86 /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 /machine:IX86 /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..41d38a102b8 --- /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.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.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:IX86 /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:IX86 /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 /machine:IX86 /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 /nologo /subsystem:windows /machine:IX86 /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..7f544adf01d --- /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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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..b50c94dd814 --- /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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 kernel32.lib user32.lib wsock32.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 /incremental:no /debug /machine:IX86 /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 /machine:IX86 /out:"../client_release/pack_isam.exe" /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 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..278b0ad292d --- /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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 /GZ /G2 /EHsc /Wp64 /Zm600 /c +# SUBTRACT CPP /YX +# 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 wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /incremental:no /debug /machine:IA64 + +!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 /machine:IX86 /out:"../client_release/perror.exe" /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 ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..4167e9ef255 --- /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.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.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:IX86 /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 /nologo /subsystem:console /machine:IX86 /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 kernel32.lib user32.lib wsock32.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 /incremental:no /machine:IX86 /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 /machine:IX86 /out:"../client_release/replace.exe" /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 ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /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..1b01e0d07bc --- /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.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.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:IX86 /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\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:IX86 /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /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:IX86 /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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:IX86 /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:IX86 /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib /nologo /subsystem:console /map /machine:IX86 /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:IX86 /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\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 /nologo /subsystem:console /machine:IX86 /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:IX86 /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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:IX86 /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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:IX86 /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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:IX86 /machine:IA64 +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /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..b9dd5d687a9 --- /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 /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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 /machine:I386 /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 /machine:I386 /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 /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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:I386 /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..287eaaedd96 --- /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..2cb5dde46b5 --- /dev/null +++ b/VC++Files/test1/test1_ia64.dsp @@ -0,0 +1,103 @@ +# 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.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.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:IX86 /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:console /machine:IX86 /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 /nologo /subsystem:console /incremental:no /debug -machineÖIA64 /libpath:"..\lib_debug" /machine:IA64 + +!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..3a68a7406aa --- /dev/null +++ b/VC++Files/tests/mysql_client_test_ia64.dsp @@ -0,0 +1,62 @@ +# 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 "Win3 (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.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.mak" CFG="mysql_client_test - Win32 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 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 /machine:IA64 /out:"..\tests\mysql_client_test.exe" +# 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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /machine:IA64 /out:"..\tests\mysql_client_test.exe" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none +# Begin Target + +# Name "mysql_client_test - WinIA64 Release" +# Begin Source File + +SOURCE=tests\mysql_client_test.c +# 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..64aae03faaf --- /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.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.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:IX86 /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:console /machine:IX86 /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 /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 From 877b2f468847e08fdc58be614a24d4e4e900c88a Mon Sep 17 00:00:00 2001 From: "georg@lmy002.wdf.sap.corp" <> Date: Mon, 7 Mar 2005 09:47:24 +0100 Subject: [PATCH 05/29] fixed conversion errors (Windows IA64 build) --- client/mysql.cc | 12 +++++------- client/readline.cc | 2 +- client/sql_string.cc | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index 2c98b7b5eb6..46bfc7d880f 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -727,7 +727,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: @@ -1663,7 +1663,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; @@ -1749,7 +1749,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, @@ -2126,7 +2126,7 @@ print_table_data_xml(MYSQL_RES *result) mysql_field_seek(result,0); tee_fputs("\n\n", PAGER); fields = mysql_fetch_fields(result); @@ -2615,7 +2615,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; } @@ -2625,8 +2625,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/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) From 6fc6a7521acfb546b9ca8712bd589796377985a2 Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Mon, 7 Mar 2005 10:21:38 +0100 Subject: [PATCH 06/29] Fix for Bug #8753 Invalid schema object version after dropping index --- mysql-test/include/have_multi_ndb.inc | 28 +++++++++++++++ mysql-test/r/ndb_alter_table.result | 14 ++++++++ mysql-test/r/ndb_multi.result | 49 +++++++++++++++++++++++++++ mysql-test/t/ndb_alter_table.test | 16 +++++++++ mysql-test/t/ndb_multi.test | 44 ++++++++++++++++++++++++ sql/ha_ndbcluster.cc | 38 +++++++++++++++++---- sql/ha_ndbcluster.h | 1 + 7 files changed, 184 insertions(+), 6 deletions(-) create mode 100644 mysql-test/include/have_multi_ndb.inc create mode 100644 mysql-test/r/ndb_multi.result create mode 100644 mysql-test/t/ndb_multi.test diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc new file mode 100644 index 00000000000..ec1a93311fb --- /dev/null +++ b/mysql-test/include/have_multi_ndb.inc @@ -0,0 +1,28 @@ +# Setup connections to both MySQL Servers connected to the cluster +connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,); + +# Check that server1 has NDB support +connection server1; +disable_query_log; +--disable_warnings +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"; +enable_query_log; + +# Check that server2 has NDB support +connection server2; +disable_query_log; +--disable_warnings +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"; +enable_query_log; + +# Set the default connection to 'server1' +connection server1; diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/r/ndb_alter_table.result index f899d254243..88ac04db111 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/r/ndb_multi.result b/mysql-test/r/ndb_multi.result new file mode 100644 index 00000000000..4a2389cd1ff --- /dev/null +++ b/mysql-test/r/ndb_multi.result @@ -0,0 +1,49 @@ +drop table if exists t1, t2, t3, t4; +flush status; +create table t1 (a int) engine=ndbcluster; +create table t2 (a int) engine=ndbcluster; +insert into t1 value (2); +insert into t2 value (3); +select * from t1; +a +2 +select * from t2; +a +3 +show status like 'handler_discover%'; +Variable_name Value +Handler_discover 0 +flush status; +select * from t1; +a +2 +update t1 set a=3 where a=2; +show status like 'handler_discover%'; +Variable_name Value +Handler_discover 1 +create table t3 (a int not null primary key, b varchar(22), +c int, last_col text) engine=ndb; +insert into t3 values(1, 'Hi!', 89, 'Longtext column'); +create table t4 (pk int primary key, b int) engine=ndb; +select * from t1; +a +3 +select * from t3; +a b c last_col +1 Hi! 89 Longtext column +show status like 'handler_discover%'; +Variable_name Value +Handler_discover 1 +show tables like 't4'; +Tables_in_test (t4) +t4 +show status like 'handler_discover%'; +Variable_name Value +Handler_discover 2 +show tables; +Tables_in_test +t1 +t2 +t3 +t4 +drop table t1, t2, t3, t4; diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 892443a1407..f39edc0ee65 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; @@ -133,6 +134,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/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test new file mode 100644 index 00000000000..9286721b677 --- /dev/null +++ b/mysql-test/t/ndb_multi.test @@ -0,0 +1,44 @@ +-- source include/have_ndb.inc +-- source include/have_multi_ndb.inc + + +--disable_warnings +drop table if exists t1, t2, t3, t4; +--enable_warnings + +flush status; + +# Create test tables on server1 +create table t1 (a int) engine=ndbcluster; +create table t2 (a int) engine=ndbcluster; +insert into t1 value (2); +insert into t2 value (3); +select * from t1; +select * from t2; +show status like 'handler_discover%'; + +# Connect to server2 and use the tables from there +connection server2; +flush status; +select * from t1; +update t1 set a=3 where a=2; +show status like 'handler_discover%'; + +# Create a new table on server2 +create table t3 (a int not null primary key, b varchar(22), +c int, last_col text) engine=ndb; +insert into t3 values(1, 'Hi!', 89, 'Longtext column'); +create table t4 (pk int primary key, b int) engine=ndb; + +# Check that the tables are accessible from server1 +connection server1; +select * from t1; +select * from t3; +show status like 'handler_discover%'; +show tables like 't4'; +show status like 'handler_discover%'; +show tables; + +drop table t1, t2, t3, t4; + + diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 3e2fc5b2855..70b86ca08d1 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -328,6 +328,36 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd) # The mapped error code */ +void ha_ndbcluster::invalidateCache() +{ + 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(m_index[i].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(NdbConnection *trans) { @@ -339,11 +369,7 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans) 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->version=0L; /* Free when thread is ready */ + invalidateCache(); break; } default: @@ -733,7 +759,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (!invalidating_ndb_table) { DBUG_PRINT("info", ("Invalidating table")); - dict->invalidateTable(m_tabname); + invalidateCache(); invalidating_ndb_table= TRUE; } else diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 07b305bad3e..149276c8356 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -201,6 +201,7 @@ class ha_ndbcluster: public handler void print_results(); longlong get_auto_increment(); + void invalidateCache(); int ndb_err(NdbConnection*); bool uses_blob_value(bool all_fields); From 792d401981108c28feb0b907a36502e0a852440e Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Mon, 7 Mar 2005 10:28:56 +0100 Subject: [PATCH 07/29] Merge 4.0.24 compile changes into the 4.1 tree. --- mysys/my_bitmap.c | 265 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 225 insertions(+), 40 deletions(-) diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 9662f219418..f0d3339535d 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -16,7 +16,18 @@ /* Handling of uchar arrays as large bitmaps. - We assume that the size of the used bitmap is less than ~(uint) 0 + + API limitations (or, rather asserted safety assumptions, + to encourage correct programming) + + * the size of the used bitmap is less than ~(uint) 0 + * it's a multiple of 8 (for efficiency reasons) + * when arguments are a bitmap and a bit number, the number + must be within bitmap size + * bitmap_set_prefix() is an exception - one can use ~0 to set all bits + * when both arguments are bitmaps, they must be of the same size + * bitmap_intersect() is an exception :) + (for for Bitmap::intersect(ulonglong map2buff)) TODO: Make assembler THREAD safe versions of these using test-and-set instructions @@ -24,60 +35,74 @@ #include "mysys_priv.h" #include -#include #include static inline void bitmap_lock(MY_BITMAP* map) { #ifdef THREAD - if (map->thread_safe) - pthread_mutex_lock(&map->mutex); + if (map->mutex) + pthread_mutex_lock(map->mutex); #endif } static inline void bitmap_unlock(MY_BITMAP* map) { #ifdef THREAD - if (map->thread_safe) - pthread_mutex_unlock(&map->mutex); + if (map->mutex) + pthread_mutex_unlock(map->mutex); #endif } -my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size, my_bool thread_safe) + +my_bool bitmap_init(MY_BITMAP *map, uchar *buf, uint bitmap_size, + my_bool thread_safe) { - if (!(map->bitmap=(uchar*) my_malloc((bitmap_size+7)/8, - MYF(MY_WME | MY_ZEROFILL)))) + DBUG_ENTER("bitmap_init"); + + DBUG_ASSERT((bitmap_size & 7) == 0); + bitmap_size/=8; + if (!(map->bitmap=buf) && + !(map->bitmap= (uchar*) my_malloc(bitmap_size + + (thread_safe ? + sizeof(pthread_mutex_t) : 0), + MYF(MY_WME | MY_ZEROFILL)))) return 1; - DBUG_ASSERT(bitmap_size != ~(uint) 0); -#ifdef THREAD - if ((map->thread_safe = thread_safe)) - pthread_mutex_init(&map->mutex, MY_MUTEX_INIT_FAST); -#endif map->bitmap_size=bitmap_size; - return 0; +#ifdef THREAD + if (thread_safe) + { + map->mutex=(pthread_mutex_t *)(map->bitmap+bitmap_size); + pthread_mutex_init(map->mutex, MY_MUTEX_INIT_FAST); + } + else + map->mutex=0; +#endif + DBUG_RETURN(0); } + void bitmap_free(MY_BITMAP *map) { + DBUG_ENTER("bitmap_free"); if (map->bitmap) { +#ifdef THREAD + if (map->mutex) + pthread_mutex_destroy(map->mutex); +#endif my_free((char*) map->bitmap, MYF(0)); map->bitmap=0; -#ifdef THREAD - if (map->thread_safe) - pthread_mutex_destroy(&map->mutex); -#endif } + DBUG_VOID_RETURN; } + void bitmap_set_bit(MY_BITMAP *map, uint bitmap_bit) { - if (bitmap_bit < map->bitmap_size) - { - bitmap_lock(map); - map->bitmap[bitmap_bit / 8] |= (1 << (bitmap_bit & 7)); - bitmap_unlock(map); - } + DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8); + bitmap_lock(map); + bitmap_fast_set_bit(map, bitmap_bit); + bitmap_unlock(map); } @@ -85,9 +110,10 @@ uint bitmap_set_next(MY_BITMAP *map) { uchar *bitmap=map->bitmap; uint bit_found = MY_BIT_NONE; - uint bitmap_size=map->bitmap_size; + uint bitmap_size=map->bitmap_size*8; uint i; + DBUG_ASSERT(map->bitmap); bitmap_lock(map); for (i=0; i < bitmap_size ; i++, bitmap++) { @@ -113,32 +139,191 @@ uint bitmap_set_next(MY_BITMAP *map) void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit) { - if (bitmap_bit < map->bitmap_size) + DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8); + bitmap_lock(map); + bitmap_fast_clear_bit(map, bitmap_bit); + bitmap_unlock(map); +} + + +void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size) +{ + uint prefix_bytes, prefix_bits; + + DBUG_ASSERT(map->bitmap && + (prefix_size <= map->bitmap_size*8 || prefix_size == (uint) ~0)); + bitmap_lock(map); + set_if_smaller(prefix_size, map->bitmap_size*8); + if ((prefix_bytes= prefix_size / 8)) + memset(map->bitmap, 0xff, prefix_bytes); + if ((prefix_bits= prefix_size & 7)) + map->bitmap[prefix_bytes++]= (1 << prefix_bits)-1; + if (prefix_bytes < map->bitmap_size) + bzero(map->bitmap+prefix_bytes, map->bitmap_size-prefix_bytes); + bitmap_unlock(map); +} + + +void bitmap_clear_all(MY_BITMAP *map) +{ + bitmap_set_prefix(map, 0); +} + + +void bitmap_set_all(MY_BITMAP *map) +{ + bitmap_set_prefix(map, ~0); +} + + +my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size) +{ + uint prefix_bits= prefix_size & 7, res= 0; + uchar *m= map->bitmap, *end_prefix= map->bitmap+prefix_size/8, + *end= map->bitmap+map->bitmap_size; + + DBUG_ASSERT(map->bitmap && prefix_size <= map->bitmap_size*8); + + bitmap_lock((MY_BITMAP *)map); + while (m < end_prefix) + if (*m++ != 0xff) + goto ret; + + if (prefix_bits && *m++ != (1 << prefix_bits)-1) + goto ret; + + while (m < end) + if (*m++ != 0) + goto ret; + + res=1; +ret: + bitmap_unlock((MY_BITMAP *)map); + return res; +} + + +my_bool bitmap_is_clear_all(const MY_BITMAP *map) +{ + return bitmap_is_prefix(map, 0); +} + +my_bool bitmap_is_set_all(const MY_BITMAP *map) +{ + return bitmap_is_prefix(map, map->bitmap_size*8); +} + + +my_bool bitmap_is_set(const MY_BITMAP *map, uint bitmap_bit) +{ + DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8); + return bitmap_fast_is_set(map, bitmap_bit); +} + + +my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2) +{ + uint res=0; + uchar *m1=map1->bitmap, *m2=map2->bitmap, *end; + + DBUG_ASSERT(map1->bitmap && map2->bitmap && + map1->bitmap_size==map2->bitmap_size); + bitmap_lock((MY_BITMAP *)map1); + bitmap_lock((MY_BITMAP *)map2); + + end= m1+map1->bitmap_size; + + while (m1 < end) { - bitmap_lock(map); - map->bitmap[bitmap_bit / 8] &= ~ (1 << (bitmap_bit & 7)); - bitmap_unlock(map); + if ((*m1++) & ~(*m2++)) + goto ret; } + + res=1; +ret: + bitmap_unlock((MY_BITMAP *)map2); + bitmap_unlock((MY_BITMAP *)map1); + return res; } -void bitmap_set_all(MY_BITMAP* map) +my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2) { + uint res; + + DBUG_ASSERT(map1->bitmap && map2->bitmap && + map1->bitmap_size==map2->bitmap_size); + bitmap_lock((MY_BITMAP *)map1); + bitmap_lock((MY_BITMAP *)map2); + + res= memcmp(map1->bitmap, map2->bitmap, map1->bitmap_size)==0; + + bitmap_unlock((MY_BITMAP *)map2); + bitmap_unlock((MY_BITMAP *)map1); + return res; +} + + +void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2) +{ + uchar *to=map->bitmap, *from=map2->bitmap, *end; + uint len=map->bitmap_size, len2=map2->bitmap_size; + + DBUG_ASSERT(map->bitmap && map2->bitmap); bitmap_lock(map); - memset(map->bitmap, 0xff, (map->bitmap_size+7)/8); + bitmap_lock((MY_BITMAP *)map2); + + end= to+min(len,len2); + + while (to < end) + *to++ &= *from++; + + if (len2 < len) + { + end+=len-len2; + while (to < end) + *to++=0; + } + + bitmap_unlock((MY_BITMAP *)map2); bitmap_unlock(map); } -my_bool bitmap_is_set(MY_BITMAP* map, uint bitmap_bit) -{ - return (bitmap_bit < map->bitmap_size) ? - (map->bitmap[bitmap_bit / 8] & (1 << (bitmap_bit & 7))) : - 0; -} -void bitmap_clear_all(MY_BITMAP* map) +void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2) { + uchar *to=map->bitmap, *from=map2->bitmap, *end; + + DBUG_ASSERT(map->bitmap && map2->bitmap && + map->bitmap_size==map2->bitmap_size); bitmap_lock(map); - bzero(map->bitmap,(map->bitmap_size+7)/8); + bitmap_lock((MY_BITMAP *)map2); + + end= to+map->bitmap_size; + + while (to < end) + *to++ &= ~(*from++); + + bitmap_unlock((MY_BITMAP *)map2); bitmap_unlock(map); } + + +void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2) +{ + uchar *to=map->bitmap, *from=map2->bitmap, *end; + + DBUG_ASSERT(map->bitmap && map2->bitmap && + map->bitmap_size==map2->bitmap_size); + bitmap_lock(map); + bitmap_lock((MY_BITMAP *)map2); + + end= to+map->bitmap_size; + + while (to < end) + *to++ |= *from++; + + bitmap_unlock((MY_BITMAP *)map2); + bitmap_unlock(map); +} + From ab271b4d84c39f8d44a3466dde48c51fb8b7ca7f Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Mon, 7 Mar 2005 10:29:50 +0100 Subject: [PATCH 08/29] Manual merge. --- sql/net_serv.cc | 153 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 105 insertions(+), 48 deletions(-) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c527ee1eb76..c8b2e28ec52 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -14,6 +14,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + This file is the net layer API for the MySQL client/server protocol, + which is a tightly coupled, proprietary protocol owned by MySQL AB. + Any re-implementations of this protocol must also be under GPL + unless one has got an license from MySQL AB stating otherwise. +*/ + /* Write and read of logical packets to/from socket @@ -26,6 +33,10 @@ C file. */ +/* + HFTODO this must be hidden if we don't want client capabilities in + embedded library + */ #ifdef __WIN__ #include #endif @@ -41,6 +52,13 @@ #include #include +#ifdef EMBEDDED_LIBRARY +#undef MYSQL_SERVER +#undef MYSQL_CLIENT +#define MYSQL_CLIENT +#endif /*EMBEDDED_LIBRARY */ + + /* The following handles the differences when this is linked between the client and the server. @@ -66,10 +84,15 @@ void sql_print_error(const char *format,...); #ifdef MYSQL_SERVER #define USE_QUERY_CACHE +/* + The following variables/functions should really not be declared + extern, but as it's hard to include mysql_priv.h here, we have to + live with this for a while. +*/ extern uint test_flags; -extern void query_cache_insert(NET *net, const char *packet, ulong length); extern ulong bytes_sent, bytes_received, net_big_packet_count; extern pthread_mutex_t LOCK_bytes_sent , LOCK_bytes_received; +extern void query_cache_insert(NET *net, const char *packet, ulong length); #else #undef statistic_add #undef statistic_increment @@ -85,7 +108,7 @@ static my_bool net_write_buff(NET *net,const char *packet,ulong len); /* Init with packet info */ -int my_net_init(NET *net, Vio* vio) +my_bool my_net_init(NET *net, Vio* vio) { DBUG_ENTER("my_net_init"); my_net_local_init(net); /* Set some limits */ @@ -104,6 +127,7 @@ int my_net_init(NET *net, Vio* vio) net->where_b = net->remain_in_buf=0; net->last_errno=0; net->query_cache_query=0; + net->report_error= 0; if (vio != 0) /* If real connection */ { @@ -132,7 +156,7 @@ void net_end(NET *net) /* Realloc the packet buffer */ -static my_bool net_realloc(NET *net, ulong length) +my_bool net_realloc(NET *net, ulong length) { uchar *buff; ulong pkt_length; @@ -141,10 +165,11 @@ static my_bool net_realloc(NET *net, ulong length) if (length >= net->max_packet_size) { - DBUG_PRINT("error",("Packet too large. Max sixe: %lu", - net->max_packet_size)); - net->error=1; - net->last_errno=ER_NET_PACKET_TOO_LARGE; + DBUG_PRINT("error", ("Packet too large. Max size: %lu", + net->max_packet_size)); + net->error= 1; + net->report_error= 1; + net->last_errno= ER_NET_PACKET_TOO_LARGE; DBUG_RETURN(1); } pkt_length = (length+IO_SIZE-1) & ~(IO_SIZE-1); @@ -156,10 +181,9 @@ static my_bool net_realloc(NET *net, ulong length) NET_HEADER_SIZE + COMP_HEADER_SIZE, MYF(MY_WME)))) { - net->error=1; -#ifdef MYSQL_SERVER - net->last_errno=ER_OUT_OF_RESOURCES; -#endif + net->error= 1; + net->report_error= 1; + net->last_errno= ER_OUT_OF_RESOURCES; DBUG_RETURN(1); } net->buff=net->write_pos=buff; @@ -193,14 +217,14 @@ void net_clear(NET *net) /* Flush write_buffer if not empty. */ -int net_flush(NET *net) +my_bool net_flush(NET *net) { - int error=0; + my_bool error= 0; DBUG_ENTER("net_flush"); if (net->buff != net->write_pos) { - error=net_real_write(net,(char*) net->buff, - (ulong) (net->write_pos - net->buff)); + error=test(net_real_write(net,(char*) net->buff, + (ulong) (net->write_pos - net->buff))); net->write_pos=net->buff; } /* Sync packet number if using compression */ @@ -223,7 +247,7 @@ int net_flush(NET *net) If compression is used the original package is modified! */ -int +my_bool my_net_write(NET *net,const char *packet,ulong len) { uchar buff[NET_HEADER_SIZE]; @@ -250,23 +274,46 @@ my_net_write(NET *net,const char *packet,ulong len) buff[3]= (uchar) net->pkt_nr++; if (net_write_buff(net,(char*) buff,NET_HEADER_SIZE)) return 1; +#ifndef DEBUG_DATA_PACKETS DBUG_DUMP("packet_header",(char*) buff,NET_HEADER_SIZE); +#endif return test(net_write_buff(net,packet,len)); } /* Send a command to the server. - As the command is part of the first data packet, we have to do some data - juggling to put the command in there, without having to create a new - packet. - This function will split big packets into sub-packets if needed. - (Each sub packet can only be 2^24 bytes) + + SYNOPSIS + net_write_command() + net NET handler + command Command in MySQL server (enum enum_server_command) + header Header to write after command + head_len Length of header + packet Query or parameter to query + len Length of packet + + DESCRIPTION + The reason for having both header and packet is so that libmysql + can easy add a header to a special command (like prepared statements) + without having to re-alloc the string. + + As the command is part of the first data packet, we have to do some data + juggling to put the command in there, without having to create a new + packet. + This function will split big packets into sub-packets if needed. + (Each sub packet can only be 2^24 bytes) + + RETURN VALUES + 0 ok + 1 error */ -int -net_write_command(NET *net,uchar command,const char *packet,ulong len) +my_bool +net_write_command(NET *net,uchar command, + const char *header, ulong head_len, + const char *packet, ulong len) { - ulong length=len+1; /* 1 extra byte for command */ + ulong length=len+1+head_len; /* 1 extra byte for command */ uchar buff[NET_HEADER_SIZE+1]; uint header_size=NET_HEADER_SIZE+1; DBUG_ENTER("net_write_command"); @@ -277,25 +324,28 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) if (length >= MAX_PACKET_LENGTH) { /* Take into account that we have the command in the first header */ - len= MAX_PACKET_LENGTH -1; + len= MAX_PACKET_LENGTH - 1 - head_len; do { int3store(buff, MAX_PACKET_LENGTH); buff[3]= (uchar) net->pkt_nr++; if (net_write_buff(net,(char*) buff, header_size) || - net_write_buff(net,packet,len)) + net_write_buff(net, header, head_len) || + net_write_buff(net, packet, len)) DBUG_RETURN(1); packet+= len; length-= MAX_PACKET_LENGTH; len= MAX_PACKET_LENGTH; + head_len= 0; header_size= NET_HEADER_SIZE; } while (length >= MAX_PACKET_LENGTH); len=length; /* Data left to be written */ } int3store(buff,length); buff[3]= (uchar) net->pkt_nr++; - DBUG_RETURN(test(net_write_buff(net,(char*) buff,header_size) || - net_write_buff(net,packet,len) || net_flush(net))); + DBUG_RETURN(test(net_write_buff(net, (char*) buff, header_size) || + (head_len && net_write_buff(net, (char*) header, head_len)) || + net_write_buff(net, packet, len) || net_flush(net))); } /* @@ -336,6 +386,9 @@ net_write_buff(NET *net,const char *packet,ulong len) else left_length= (ulong) (net->buff_end - net->write_pos); +#ifdef DEBUG_DATA_PACKETS + DBUG_DUMP("data", packet, len); +#endif if (len > left_length) { if (net->write_pos != net->buff) @@ -411,10 +464,12 @@ net_real_write(NET *net,const char *packet,ulong len) COMP_HEADER_SIZE, MYF(MY_WME)))) { #ifdef MYSQL_SERVER - net->last_errno=ER_OUT_OF_RESOURCES; - net->error=2; + net->last_errno= ER_OUT_OF_RESOURCES; + net->error= 2; + /* TODO is it needed to set this variable if we have no socket */ + net->report_error= 1; #endif - net->reading_or_writing=0; + net->reading_or_writing= 0; DBUG_RETURN(1); } memcpy(b+header_length,packet,len); @@ -461,9 +516,10 @@ net_real_write(NET *net,const char *packet,ulong len) my_progname,vio_errno(net->vio)); #endif /* EXTRA_DEBUG */ #ifdef MYSQL_SERVER - net->last_errno=ER_NET_ERROR_ON_WRITE; + net->last_errno= ER_NET_ERROR_ON_WRITE; #endif - net->error=2; /* Close socket */ + net->error= 2; /* Close socket */ + net->report_error= 1; goto end; } retry_count=0; @@ -489,7 +545,8 @@ net_real_write(NET *net,const char *packet,ulong len) continue; } #endif /* defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER) */ - net->error=2; /* Close socket */ + net->error= 2; /* Close socket */ + net->report_error= 1; #ifdef MYSQL_SERVER net->last_errno= (interrupted ? ER_NET_WRITE_INTERRUPTED : ER_NET_ERROR_ON_WRITE); @@ -667,9 +724,10 @@ my_real_read(NET *net, ulong *complen) my_progname,vio_errno(net->vio)); #endif /* EXTRA_DEBUG */ len= packet_error; - net->error=2; /* Close socket */ + net->error= 2; /* Close socket */ + net->report_error= 1; #ifdef MYSQL_SERVER - net->last_errno=ER_NET_FCNTL_ERROR; + net->last_errno= ER_NET_FCNTL_ERROR; #endif goto end; } @@ -698,7 +756,8 @@ my_real_read(NET *net, ulong *complen) DBUG_PRINT("error",("Couldn't read packet: remain: %u errno: %d length: %ld", remain, vio_errno(net->vio), length)); len= packet_error; - net->error=2; /* Close socket */ + net->error= 2; /* Close socket */ + net->report_error= 1; #ifdef MYSQL_SERVER net->last_errno= (interrupted ? ER_NET_READ_INTERRUPTED : ER_NET_READ_ERROR); @@ -712,6 +771,8 @@ my_real_read(NET *net, ulong *complen) if (i == 0) { /* First parts is packet length */ ulong helping; + DBUG_DUMP("packet_header",(char*) net->buff+net->where_b, + NET_HEADER_SIZE); if (net->buff[net->where_b + 3] != (uchar) net->pkt_nr) { if (net->buff[net->where_b] != (uchar) 255) @@ -720,7 +781,6 @@ my_real_read(NET *net, ulong *complen) ("Packets out of order (Found: %d, expected %u)", (int) net->buff[net->where_b + 3], net->pkt_nr)); - DBUG_DUMP("packet_header",(char*) net->buff+net->where_b, 4); #ifdef EXTRA_DEBUG fprintf(stderr,"Packets out of order (Found: %d, expected %d)\n", (int) net->buff[net->where_b + 3], @@ -728,6 +788,7 @@ my_real_read(NET *net, ulong *complen) #endif } len= packet_error; + net->report_error= 1; #ifdef MYSQL_SERVER net->last_errno=ER_NET_PACKETS_OUT_OF_ORDER; #endif @@ -776,6 +837,10 @@ end: vio_blocking(net->vio, net_blocking, &old_mode); } net->reading_or_writing=0; +#ifdef DEBUG_DATA_PACKETS + if (len != packet_error) + DBUG_DUMP("data",(char*) net->buff+net->where_b, len); +#endif return(len); } @@ -908,7 +973,8 @@ my_net_read(NET *net) if (my_uncompress((byte*) net->buff + net->where_b, &packet_len, &complen)) { - net->error=2; /* caller will close socket */ + net->error= 2; /* caller will close socket */ + net->report_error= 1; #ifdef MYSQL_SERVER net->last_errno=ER_NET_UNCOMPRESS_ERROR; #endif @@ -929,12 +995,3 @@ my_net_read(NET *net) return len; } -bool net_request_file(NET* net, const char* fname) -{ - char tmp [FN_REFLEN+1],*end; - DBUG_ENTER("net_request_file"); - tmp[0] = (char) 251; /* NULL_LENGTH */ - end=strnmov(tmp+1,fname,sizeof(tmp)-2); - DBUG_RETURN(my_net_write(net,tmp,(uint) (end-tmp)) || - net_flush(net)); -} From ce870852944dc84d040139708759ab1687fbf6cd Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Mon, 7 Mar 2005 10:53:16 +0100 Subject: [PATCH 09/29] Review fixes for Bug #8753 Invalid schema object version after dropping index --- sql/ha_ndbcluster.cc | 9 ++++----- sql/ha_ndbcluster.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 70b86ca08d1..f0988affc2e 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -328,7 +328,7 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd) # The mapped error code */ -void ha_ndbcluster::invalidateCache() +void ha_ndbcluster::invalidateDictionaryCache() { NDBDICT *dict= get_ndb()->getDictionary(); DBUG_PRINT("info", ("invalidating %s", m_tabname)); @@ -341,8 +341,7 @@ void ha_ndbcluster::invalidateCache() NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index; NDB_INDEX_TYPE idx_type= m_index[i].type; - - switch(m_index[i].type) { + switch(idx_type) { case(PRIMARY_KEY_ORDERED_INDEX): case(ORDERED_INDEX): dict->invalidateIndex(index->getName(), m_tabname); @@ -369,7 +368,7 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans) switch (err.classification) { case NdbError::SchemaError: { - invalidateCache(); + invalidateDictionaryCache(); break; } default: @@ -759,7 +758,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (!invalidating_ndb_table) { DBUG_PRINT("info", ("Invalidating table")); - invalidateCache(); + invalidateDictionaryCache(); invalidating_ndb_table= TRUE; } else diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 149276c8356..2261b56b071 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -201,7 +201,7 @@ class ha_ndbcluster: public handler void print_results(); longlong get_auto_increment(); - void invalidateCache(); + void invalidateDictionaryCache(); int ndb_err(NdbConnection*); bool uses_blob_value(bool all_fields); From 38adb1ba79bbee843516a4b79a5fee4cc4b20139 Mon Sep 17 00:00:00 2001 From: "marko@hundin.mysql.fi" <> Date: Mon, 7 Mar 2005 12:03:33 +0200 Subject: [PATCH 10/29] InnoDB: Portability fixes for warnings reported on IA-64 Windows --- innobase/buf/buf0lru.c | 6 +++--- innobase/dict/dict0dict.c | 5 +++-- innobase/eval/eval0proc.c | 2 +- innobase/include/mem0mem.ic | 2 +- innobase/include/page0page.ic | 8 ++++---- innobase/include/pars0pars.h | 2 +- innobase/include/pars0sym.h | 2 +- innobase/mem/mem0dbg.c | 2 +- innobase/os/os0file.c | 22 +++++++++++----------- innobase/os/os0sync.c | 4 ++-- innobase/os/os0thread.c | 4 ++-- innobase/rem/rem0cmp.c | 13 ++++++++----- innobase/row/row0mysql.c | 12 ++++++------ innobase/row/row0sel.c | 8 ++++---- innobase/trx/trx0sys.c | 3 ++- innobase/ut/ut0ut.c | 2 +- 16 files changed, 51 insertions(+), 46 deletions(-) diff --git a/innobase/buf/buf0lru.c b/innobase/buf/buf0lru.c index f3fb19ae183..05e92933edf 100644 --- a/innobase/buf/buf0lru.c +++ b/innobase/buf/buf0lru.c @@ -877,11 +877,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 a73dd8b9dd9..2bceb432aa6 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -2292,8 +2292,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/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 3d2bf3b090e..c7bf78040e9 100644 --- a/innobase/include/page0page.ic +++ b/innobase/include/page0page.ic @@ -484,10 +484,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 cc743ffad41..8d1ad895aa9 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -2042,8 +2042,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; @@ -2059,7 +2059,7 @@ try_again: goto error_handling; } - ret = ReadFile(file, buf, n, &len, NULL); + ret = ReadFile(file, buf, (DWORD) n, &len, NULL); os_mutex_exit(os_file_seek_mutexes[i]); @@ -2145,8 +2145,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; @@ -2162,7 +2162,7 @@ try_again: goto error_handling; } - ret = ReadFile(file, buf, n, &len, NULL); + ret = ReadFile(file, buf, (DWORD) n, &len, NULL); os_mutex_exit(os_file_seek_mutexes[i]); @@ -2231,8 +2231,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; @@ -2259,7 +2259,7 @@ retry: return(FALSE); } - ret = WriteFile(file, buf, n, &len, NULL); + ret = WriteFile(file, buf, (DWORD) n, &len, NULL); /* Always do fsync to reduce the probability that when the OS crashes, a database page is only partially physically written to disk. */ @@ -3244,7 +3244,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; @@ -4091,7 +4091,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 12a8abf3069..0278e3b2b66 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 cf549284acc..f2dc8a7021a 100644 --- a/innobase/rem/rem0cmp.c +++ b/innobase/rem/rem0cmp.c @@ -321,7 +321,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 */ @@ -527,8 +529,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; @@ -851,8 +854,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 482cf698547..e2b34e6e3f1 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -745,7 +745,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -839,7 +839,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -954,7 +954,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1202,7 +1202,7 @@ run_again: trx->op_info = ""; - return(err); + return((int) err); } que_thr_stop_for_mysql_no_error(thr, trx); @@ -1367,7 +1367,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] = '#'; @@ -1857,7 +1857,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 7c935128d8a..07140e74e54 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3326,10 +3326,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 54bd5be01a1..51e193d563b 100644 --- a/innobase/trx/trx0sys.c +++ b/innobase/trx/trx0sys.c @@ -666,7 +666,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/ut/ut0ut.c b/innobase/ut/ut0ut.c index 18722149a8f..2a2db9442b3 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -428,7 +428,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; } From e8e5cd50535b783c526822e75828a0f1a34670fc Mon Sep 17 00:00:00 2001 From: "georg@lmy002.wdf.sap.corp" <> Date: Mon, 7 Mar 2005 13:04:05 +0100 Subject: [PATCH 11/29] Various fixes for Windows 2003 Platform SDK SP1 beta --- VC++Files/client/mysqladmin_ia64.dsp | 16 +- VC++Files/client/mysqldump_ia64.dsp | 16 +- VC++Files/client/mysqlimport_ia64.dsp | 36 +- VC++Files/client/mysqlshow_ia64.dsp | 16 +- VC++Files/client/mysqltest_ia64.dsp | 21 +- VC++Files/comp_err/comp_err_ia64.dsp | 12 +- VC++Files/isamchk/isamchk_ia64.dsp | 12 +- VC++Files/libmysql/libmysql_ia64.dsp | 12 +- .../examples/test_libmysqld_ia64.dsp | 11 +- VC++Files/libmysqld/libmysqld_ia64.dsp | 23 +- VC++Files/libmysqltest/myTest_ia64.dsp | 12 +- .../my_print_defaults_ia64.dsp | 19 +- .../myisam_ftdump/myisam_ftdump_ia64.dsp | 12 +- VC++Files/myisamchk/myisamchk_ia64.dsp | 16 +- VC++Files/myisamlog/myisamlog_ia64.dsp | 16 +- VC++Files/myisampack/myisampack_ia64.dsp | 16 +- .../mysql-test/mysql_test_run_new_ia64.dsp | 14 +- VC++Files/mysql_ia64.dsw | 329 ++++++------------ VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp | 16 +- VC++Files/mysqlcheck/mysqlcheck_ia64.dsp | 16 +- VC++Files/mysqlmanager/MySqlManager_ia64.dsp | 8 +- .../mysqlshutdown/mysqlshutdown_ia64.dsp | 12 +- VC++Files/mysqlwatch/mysqlwatch_ia64.dsp | 8 +- VC++Files/pack_isam/pack_isam_ia64.dsp | 16 +- VC++Files/perror/perror_ia64.dsp | 20 +- VC++Files/replace/replace_ia64.dsp | 16 +- VC++Files/sql/mysqld_ia64.dsp | 40 +-- VC++Files/sql/mysqldmax_ia64.dsp | 10 +- VC++Files/strings/strings_ia64.dsp | 2 +- VC++Files/test1/test1_ia64.dsp | 13 +- VC++Files/tests/mysql_client_test_ia64.dsp | 35 +- VC++Files/thr_test/thr_test_ia64.dsp | 12 +- 32 files changed, 380 insertions(+), 453 deletions(-) diff --git a/VC++Files/client/mysqladmin_ia64.dsp b/VC++Files/client/mysqladmin_ia64.dsp index 1669b1bad72..5a5e4a99071 100644 --- a/VC++Files/client/mysqladmin_ia64.dsp +++ b/VC++Files/client/mysqladmin_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqladmin - WinIA64 classic" +!MESSAGE NMAKE /f "mysqladmin_ia64.mak" CFG="mysqladmin - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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 /machine:IX86 /out:"../client_release/mysqladmin.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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 /machine:IX86 /out:"../client_debug/mysqladmin.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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" @@ -106,8 +106,8 @@ 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 /machine:IX86 /out:"../client_release/mysqladmin.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 /machine:IX86 /out:"../client_classic/mysqladmin.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/client/mysqldump_ia64.dsp b/VC++Files/client/mysqldump_ia64.dsp index 27b8ed47062..698cd0b9c2c 100644 --- a/VC++Files/client/mysqldump_ia64.dsp +++ b/VC++Files/client/mysqldump_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqldump - WinIA64 classic" +!MESSAGE NMAKE /f "mysqldump_ia64.mak" CFG="mysqldump - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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: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 mysys.lib /nologo /subsystem:console /machine:IX86 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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: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 mysys.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/mysqldump.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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" @@ -106,8 +106,8 @@ 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 /machine:IX86 /out:"../client_release/mysqldump.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 mysys.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/client/mysqlimport_ia64.dsp b/VC++Files/client/mysqlimport_ia64.dsp index 35d9e6e9f64..cd8f5523efd 100644 --- a/VC++Files/client/mysqlimport_ia64.dsp +++ b/VC++Files/client/mysqlimport_ia64.dsp @@ -4,22 +4,22 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=mysqlimport - Win32IAg4 classic +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.mak". +!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.mak" CFG="mysqlimport - Win32IAg4 classic" +!MESSAGE NMAKE /f "mysqlimport_ia64.mak" CFG="mysqlimport - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mysqlimport - Win32IAg4 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "mysqlimport - Win32IAg4 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "mysqlimport - Win32IAg4 classic" (based on "Win32 (x86) Console Application") +!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 @@ -29,7 +29,7 @@ CFG=mysqlimport - Win32IAg4 classic CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "mysqlimport - Win32IAg4 Release" +!IF "$(CFG)" == "mysqlimport - WinIA64 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -52,10 +52,10 @@ 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 /machine:IX86 /out:"../client_release/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 - Win32IAg4 Debug" +!ELSEIF "$(CFG)" == "mysqlimport - WinIA64 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -78,10 +78,10 @@ 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: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 setargv.obj /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/mysqlimport.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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 - Win32IAg4 classic" +!ELSEIF "$(CFG)" == "mysqlimport - WinIA64 classic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -106,16 +106,16 @@ 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 /machine:IX86 /out:"../client_release/mysqlimport.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 /machine:IX86 /out:"../client_classic/mysqlimport.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 - Win32IAg4 Release" -# Name "mysqlimport - Win32IAg4 Debug" -# Name "mysqlimport - Win32IAg4 classic" +# Name "mysqlimport - WinIA64 Release" +# Name "mysqlimport - WinIA64 Debug" +# Name "mysqlimport - WinIA64 classic" # Begin Source File SOURCE=.\mysqlimport.c diff --git a/VC++Files/client/mysqlshow_ia64.dsp b/VC++Files/client/mysqlshow_ia64.dsp index 8b02a03707b..dd83a3f1ef5 100644 --- a/VC++Files/client/mysqlshow_ia64.dsp +++ b/VC++Files/client/mysqlshow_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqlshow - WinIA64 classic" +!MESSAGE NMAKE /f "mysqlshow_ia64.mak" CFG="mysqlshow - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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 /machine:IX86 /out:"../client_release/mysqlshow.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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: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 /incremental:no /debug /machine:IX86 /out:"../client_debug/mysqlshow.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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" @@ -106,8 +106,8 @@ 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 /machine:IX86 /out:"../client_release/mysqlshow.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 /machine:IX86 /out:"../client_classic/mysqlshow.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/client/mysqltest_ia64.dsp b/VC++Files/client/mysqltest_ia64.dsp index f43444f686c..160683725e6 100644 --- a/VC++Files/client/mysqltest_ia64.dsp +++ b/VC++Files/client/mysqltest_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="MYSQLTEST - WinIA64 RELEASE" +!MESSAGE NMAKE /f "mysqltest_ia64.mak" CFG="MYSQLTEST - WinIA64 RELEASE" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -46,16 +46,16 @@ 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" /GZ /G2 /EHsc /Wp64 /Zm600 /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 /machine:I386 /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\" +# 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 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 /incremental:no /debug /machine:I386 /out:"..\client_debug\mysqltest.exe" /libpath:"..\lib_debug\\" +# 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" @@ -69,6 +69,7 @@ LINK32=link.exe # 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 @@ -81,9 +82,9 @@ 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 /machine:I386 /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\" +# 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 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 /machine:I386 /out:"..\client_classic\mysqltest.exe" /libpath:"..\lib_release\\" +# 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" @@ -103,16 +104,16 @@ 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" /GF /G2 /EHsc /Wp64 /Zm600 /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 /machine:I386 /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\" +# 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 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 /machine:I386 /out:"..\client_release\mysqltest.exe" /libpath:"..\lib_release\\" +# 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 diff --git a/VC++Files/comp_err/comp_err_ia64.dsp b/VC++Files/comp_err/comp_err_ia64.dsp index f7f30094803..9d4e8bd5353 100644 --- a/VC++Files/comp_err/comp_err_ia64.dsp +++ b/VC++Files/comp_err/comp_err_ia64.dsp @@ -9,12 +9,12 @@ 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.mak". +!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.mak" CFG="COMP_ERR - WinIA64 DEBUG" +!MESSAGE NMAKE /f "comp_err_ia64.mak" CFG="COMP_ERR - WinIA64 DEBUG" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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 ..\lib_release\mysys.lib wsock32.lib ..\lib_release\strings.lib /nologo /subsystem:console /nodefaultlib:"LIBC.lib" /out:"../client_release/comp-err.exe" /machine:IA64 +# 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" @@ -75,8 +75,8 @@ 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:IX86 /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 ..\lib_release\mysys.lib wsock32.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /nodefaultlib:"LIBC.lib" /out:"../client_release/comp-err.exe" /machine:IA64 +# 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 diff --git a/VC++Files/isamchk/isamchk_ia64.dsp b/VC++Files/isamchk/isamchk_ia64.dsp index f019705cb5b..61eab230e1f 100644 --- a/VC++Files/isamchk/isamchk_ia64.dsp +++ b/VC++Files/isamchk/isamchk_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="isamchk - WinIA64 classic" +!MESSAGE NMAKE /f "isamchk_ia64.mak" CFG="isamchk - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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 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 /machine:IX86 /out:"../client_release/isamchk.exe" /machine:IA64 +# 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" @@ -79,8 +79,8 @@ 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 /machine:IX86 /out:"../client_release/isamchk.exe" /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 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/isamchk.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/libmysql/libmysql_ia64.dsp b/VC++Files/libmysql/libmysql_ia64.dsp index 1584e6f567e..4c4776dfc2f 100644 --- a/VC++Files/libmysql/libmysql_ia64.dsp +++ b/VC++Files/libmysql/libmysql_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="libmysql - WinIA64 Debug" +!MESSAGE NMAKE /f "libmysql_ia64.mak" CFG="libmysql - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -53,8 +53,8 @@ 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:IX86 /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 /nologo /subsystem:windows /dll /machine:IX86 /def:"libmysql.def" /out:"..\lib_release\libmysql.dll" /libpath:"." /libpath:"..\lib_release" /machine:IA64 +# 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 @@ -85,8 +85,8 @@ 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 /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:IX86 /def:"libmysql.def" /out:"..\lib_debug\libmysql.dll" /libpath:"." /libpath:"..\lib_debug" /machine:IA64 +# 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)" diff --git a/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp b/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp index 9391346d518..049b214e5ff 100644 --- a/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp +++ b/VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="test_libmysqld - WinIA64 Release" +!MESSAGE NMAKE /f "test_libmysqld_ia64.mak" CFG="test_libmysqld - WinIA64 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -39,16 +39,15 @@ RSC=rc.exe # 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" /YX /FD /G2 /EHsc /Wp64 /Zm600 /c -# SUBTRACT CPP /WX /Fr +# 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /nodefaultlib:"LIBCMTD" /out:"Release/mysql-server.exe" /machine:IA64 +# 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" diff --git a/VC++Files/libmysqld/libmysqld_ia64.dsp b/VC++Files/libmysqld/libmysqld_ia64.dsp index f47936371d6..fe99ea480c7 100644 --- a/VC++Files/libmysqld/libmysqld_ia64.dsp +++ b/VC++Files/libmysqld/libmysqld_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="libmysqld - WinIA64 pro" +!MESSAGE NMAKE /f "libmysqld_ia64.mak" CFG="libmysqld - WinIA64 pro" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -55,8 +55,8 @@ 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:IX86 /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\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 /machine:IX86 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64 +# 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" @@ -72,8 +72,7 @@ LINK32=link.exe # 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 /GZ /G2 /EHsc /Wp64 /Zm600 /c -# SUBTRACT CPP /X /Fr +# 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" @@ -82,8 +81,8 @@ 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 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_tls.lib ..\lib_debug\mysys_tls.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap_tls.lib ..\lib_debug\innodb.lib /nologo /dll /incremental:no /debug /machine:IX86 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /machine:IA64 +# 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" @@ -110,8 +109,8 @@ 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 /machine:IX86 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /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\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 /machine:IX86 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64 +# 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" @@ -138,8 +137,8 @@ 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 /machine:IX86 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /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\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 /machine:IX86 /out:"../lib_pro/libmysqld.dll" /implib:"../lib_release/libmysqld.lib" /machine:IA64 +# 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 diff --git a/VC++Files/libmysqltest/myTest_ia64.dsp b/VC++Files/libmysqltest/myTest_ia64.dsp index 9b603082535..4affa81ef54 100644 --- a/VC++Files/libmysqltest/myTest_ia64.dsp +++ b/VC++Files/libmysqltest/myTest_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="myTest - WinIA64 Debug" +!MESSAGE NMAKE /f "myTest_ia64.mak" CFG="myTest - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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 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:IX86 /libpath:"..\lib_release" /machine:IA64 +# 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" @@ -77,8 +77,8 @@ 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 /nologo /subsystem:console /incremental:no /debug /libpath:"..\lib_debug" /machine:IA64 +# 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 diff --git a/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp b/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp index ed52d8363bb..9fefa5c927e 100644 --- a/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp +++ b/VC++Files/my_print_defaults/my_print_defaults_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="my_print_defaults - WinIA64 classic" +!MESSAGE NMAKE /f "my_print_defaults_ia64.mak" CFG="my_print_defaults - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /out:"../client_release/my_print_defaults.exe" /machine:IA64 +# 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" @@ -69,15 +69,16 @@ LINK32=link.exe # 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 /RTC1 /G2 /EHsc /Wp64 /Zm600 /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 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 /incremental:no /debug /machine:IX86 /nodefaultlib:"LIBCMTD.lib" /out:"../client_debug/my_print_defaults.exe" /machine:IA64 +# 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" @@ -102,8 +103,8 @@ 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 /machine:IX86 /out:"../client_release/my_print_defaults.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 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\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/my_print_defaults.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp b/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp index 16d6f8253dc..175561c6c05 100644 --- a/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp +++ b/VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="myisam_ftdump - WinIA64 Debug" +!MESSAGE NMAKE /f "myisam_ftdump_ia64.mak" CFG="myisam_ftdump - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -50,8 +50,8 @@ 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:IX86 /machine:IA64 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_release/myisam_ftdump.exe" /machine:IA64 +# 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" @@ -76,8 +76,8 @@ 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 wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setargv.obj ..\lib_debug\zlib.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/myisam_ftdump.exe" t /machine:IA64 +# 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 diff --git a/VC++Files/myisamchk/myisamchk_ia64.dsp b/VC++Files/myisamchk/myisamchk_ia64.dsp index 026cb31e2b8..d6b1d5825ee 100644 --- a/VC++Files/myisamchk/myisamchk_ia64.dsp +++ b/VC++Files/myisamchk/myisamchk_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="myisamchk - WinIA64 classic" +!MESSAGE NMAKE /f "myisamchk_ia64.mak" CFG="myisamchk - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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:IX86 /machine:IA64 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /machine:IX86 /out:"../client_release/myisamchk.exe" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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 wsock32.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 /incremental:no /debug /machine:IX86 /out:"../client_debug/myisamchk.exe" /machine:IA64 +# 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" @@ -106,8 +106,8 @@ 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 /machine:IX86 /out:"../client_release/myisamchk.exe" /machine:IA64 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/myisamchk.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/myisamlog/myisamlog_ia64.dsp b/VC++Files/myisamlog/myisamlog_ia64.dsp index 6025f82d3fd..dc830eaf314 100644 --- a/VC++Files/myisamlog/myisamlog_ia64.dsp +++ b/VC++Files/myisamlog/myisamlog_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="myisamlog - WinIA64 classic" +!MESSAGE NMAKE /f "myisamlog_ia64.mak" CFG="myisamlog - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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:IX86 /machine:IA64 -# ADD 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" /machine:IX86 /out:"../client_release/myisamlog.exe" /machine:IA64 +# 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" @@ -79,8 +79,8 @@ 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 wsock32.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 /incremental:no /pdb:"debug/myisamchk.pdb" /debug /machine:IX86 /out:"../client_debug/myisamlog.exe" /machine:IA64 +# 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" @@ -106,9 +106,9 @@ 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" /machine:IX86 /out:"../client_release/myisamlog.exe" /machine:IA64 +# 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 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:"release/myisamchk.pdb" /machine:IX86 /out:"../client_classic/myisamlog.exe" /libpath:"..\lib_release\\" /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_classic/myisamlog.exe" /libpath:"..\lib_release\\" /machine:IA64 # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/VC++Files/myisampack/myisampack_ia64.dsp b/VC++Files/myisampack/myisampack_ia64.dsp index e482e243220..8a2045faa22 100644 --- a/VC++Files/myisampack/myisampack_ia64.dsp +++ b/VC++Files/myisampack/myisampack_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="myisampack - WinIA64 classic" +!MESSAGE NMAKE /f "myisampack_ia64.mak" CFG="myisampack - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj /nologo /subsystem:console /machine:IX86 /out:"../client_release/myisampack.exe" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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 wsock32.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 /incremental:no /debug /machine:IX86 /out:"../client_debug/myisampack.exe" /machine:IA64 +# 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" @@ -104,8 +104,8 @@ 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 /machine:IX86 /out:"../client_release/myisampack.exe" /machine:IA64 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib setargv.obj ..\lib_release\myisam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/myisampack.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp index fc7e274b5be..a6252d0cb7b 100644 --- a/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp +++ b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysql_test_run_new - WinIA64 Release" +!MESSAGE NMAKE /f "mysql_test_run_new_ia64.mak" CFG="mysql_test_run_new - WinIA64 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -39,6 +39,7 @@ RSC=rc.exe # 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 @@ -51,9 +52,9 @@ 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 /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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" @@ -67,6 +68,7 @@ LINK32=link.exe # 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 @@ -79,9 +81,9 @@ 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 /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.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 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 /machine:IA64 /out:"..\mysql-test\mysql_test_run_new.exe" t +# 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 diff --git a/VC++Files/mysql_ia64.dsw b/VC++Files/mysql_ia64.dsw index a7368d09da6..8af4a7e5c42 100644 --- a/VC++Files/mysql_ia64.dsw +++ b/VC++Files/mysql_ia64.dsw @@ -3,7 +3,20 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "MySqlManager"=".\mysqlmanager\MySqlManager_ia64.dsp" - Package Owner=<4> +Project: "mysys"=".\mysys\mysys_ia64.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + + +############################################################################### + +Project: "strings"=".\strings\strings_ia64.dsp" - Package Owner=<4> Package=<5> {{{ @@ -11,14 +24,35 @@ Package=<5> Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name mysqlclient_ia64 - End Project Dependency }}} ############################################################################### -Project: "bdb"=".\bdb\bdb_ia64.dsp" - Package Owner=<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> {{{ @@ -60,6 +94,75 @@ 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> @@ -222,21 +325,6 @@ Package=<4> ############################################################################### -Project: "myisam"=".\myisam\myisam_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name dbug - End Project Dependency -}}} - -############################################################################### - Project: "myisam_ftdump"=".\myisam_ftdump\myisam_ftdump_ia64.dsp" - Package Owner=<4> Package=<5> @@ -315,45 +403,6 @@ Package=<4> ############################################################################### -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: "mysql"=".\client\mysql_ia64.dsp" - Package Owner=<4> Package=<5> @@ -417,21 +466,6 @@ 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: "mysqld"=".\sql\mysqld_ia64.dsp" - Package Owner=<4> Package=<5> @@ -441,22 +475,22 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name heap_ia64 + Project_Dep_Name heap End Project Dependency Begin Project Dependency - Project_Dep_Name isam_ia64 + Project_Dep_Name isam End Project Dependency Begin Project Dependency - Project_Dep_Name merge_ia64 + Project_Dep_Name merge End Project Dependency Begin Project Dependency - Project_Dep_Name mysys_ia64 + Project_Dep_Name mysys End Project Dependency Begin Project Dependency - Project_Dep_Name regex_ia64 + Project_Dep_Name regex End Project Dependency Begin Project Dependency - Project_Dep_Name strings_ia64 + Project_Dep_Name strings End Project Dependency Begin Project Dependency Project_Dep_Name dbug_ia64 @@ -498,9 +532,6 @@ Package=<4> Project_Dep_Name myisammrg End Project Dependency Begin Project Dependency - Project_Dep_Name bdb - End Project Dependency - Begin Project Dependency Project_Dep_Name vio End Project Dependency Begin Project Dependency @@ -636,18 +667,6 @@ Package=<4> ############################################################################### -Project: "mysys"=".\mysys\mysys_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "pack_isam"=".\pack_isam\pack_isam_ia64.dsp" - Package Owner=<4> Package=<5> @@ -693,18 +712,6 @@ Package=<4> ############################################################################### -Project: "regex"=".\regex\regex_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "replace"=".\replace\replace_ia64.dsp" - Package Owner=<4> Package=<5> @@ -726,18 +733,6 @@ Package=<4> ############################################################################### -Project: "strings"=".\strings\strings_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "test1"=".\test1\test1_ia64.dsp" - Package Owner=<4> Package=<5> @@ -753,24 +748,6 @@ Package=<4> ############################################################################### -Project: "test_libmysqld"=".\libmysqld\examples\test_libmysqld_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libmysqld - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - Project: "thr_test"=".\thr_test\thr_test_ia64.dsp" - Package Owner=<4> Package=<5> @@ -790,84 +767,6 @@ Package=<4> End Project Dependency }}} -############################################################################### - -Project: "vio"=".\vio\vio_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "zlib"=".\zlib\zlib_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "mysqltest"=.\client\mysqltest_ia64.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name libmysql - End Project Dependency - Begin Project Dependency - Project_Dep_Name mysys - End Project Dependency - Begin Project Dependency - Project_Dep_Name regex - End Project Dependency -}}} - -############################################################################### - -Project: "mysql_client_test"=.\tests\mysql_client_test_ia64.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - - -Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new_ia64.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ Begin Project Dependency - Project_Dep_Name mysqltest - End Project Dependency - Begin Project Dependency - Project_Dep_Name mysqladmin - End Project Dependency - Begin Project Dependency - Project_Dep_Name mysql_client_test - End Project Dependency -}}} - ############################################################################### diff --git a/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp b/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp index b8ec68ff1e1..334c5087365 100644 --- a/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp +++ b/VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqlbinlog - WinIA64 classic" +!MESSAGE NMAKE /f "mysqlbinlog_ia64.mak" CFG="mysqlbinlog - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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: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 /machine:IX86 /out:"../client_release/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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" @@ -77,8 +77,8 @@ 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 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 /machine:IX86 /out:"../client_debug/mysqlbinlog.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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" @@ -103,9 +103,9 @@ 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 /machine:IX86 /out:"../client_release/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 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 /machine:IX86 /out:"../client_classic/mysqlbinlog.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/mysqlbinlog.exe" /libpath:"..\lib_release\\" /machine:IA64 # SUBTRACT LINK32 /debug !ENDIF diff --git a/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp b/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp index f97f5e07bcf..1f1cf76276f 100644 --- a/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp +++ b/VC++Files/mysqlcheck/mysqlcheck_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqlcheck - WinIA64 classic" +!MESSAGE NMAKE /f "mysqlcheck_ia64.mak" CFG="mysqlcheck - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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: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 /machine:IX86 /out:"../client_release/mysqlcheck.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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" @@ -76,8 +76,8 @@ 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 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 /machine:IX86 /out:"../client_debug/mysqlcheck.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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" @@ -102,8 +102,8 @@ 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 /machine:IX86 /out:"../client_release/mysqlcheck.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 /machine:IX86 /out:"../client_classic/mysqlcheck.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/mysqlmanager/MySqlManager_ia64.dsp b/VC++Files/mysqlmanager/MySqlManager_ia64.dsp index 98ead530497..b0ffc9e48c6 100644 --- a/VC++Files/mysqlmanager/MySqlManager_ia64.dsp +++ b/VC++Files/mysqlmanager/MySqlManager_ia64.dsp @@ -53,8 +53,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /machine:IX86 /machine:IA64 -# ADD LINK32 /nologo /subsystem:windows /machine:IX86 /out:"../client_release/MySqlManager.exe" /machine:IA64 +# 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" @@ -82,8 +82,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:IX86 /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 /machine:IX86 /out:"../client_debug/MySqlManager.exe" /libpath:"..\lib_debug\\" /machine:IA64 +# 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 diff --git a/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp b/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp index 41d38a102b8..2549606bf60 100644 --- a/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp +++ b/VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqlshutdown - WinIA64 Debug" +!MESSAGE NMAKE /f "mysqlshutdown_ia64.mak" CFG="mysqlshutdown - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -53,8 +53,8 @@ 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:IX86 /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:IX86 /out:"../client_release/mysqlshutdown.exe" /machine:IA64 +# 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" @@ -82,8 +82,8 @@ 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:IX86 /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 /nologo /subsystem:windows /machine:IX86 /out:"../client_debug/mysqlshutdown.exe" /machine:IA64 +# 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 diff --git a/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp b/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp index 7f544adf01d..eb17b6991f8 100644 --- a/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp +++ b/VC++Files/mysqlwatch/mysqlwatch_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqlwatch - WinIA64 Release" +!MESSAGE NMAKE /f "mysqlwatch_ia64.mak" CFG="mysqlwatch - WinIA64 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -46,8 +46,8 @@ 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /out:"../client_release/mysqlwatch.exe" /machine:IA64 +# 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" diff --git a/VC++Files/pack_isam/pack_isam_ia64.dsp b/VC++Files/pack_isam/pack_isam_ia64.dsp index b50c94dd814..58b88f02f08 100644 --- a/VC++Files/pack_isam/pack_isam_ia64.dsp +++ b/VC++Files/pack_isam/pack_isam_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="pack_isam - WinIA64 classic" +!MESSAGE NMAKE /f "pack_isam_ia64.mak" CFG="pack_isam - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /out:"../client_release/pack_isam.exe" /machine:IA64 +# 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" @@ -77,8 +77,8 @@ 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 wsock32.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 /incremental:no /debug /machine:IX86 /out:"../client_debug/pack_isam.exe" /machine:IA64 +# 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" @@ -103,8 +103,8 @@ 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 /machine:IX86 /out:"../client_release/pack_isam.exe" /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 ..\lib_release\isam.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/pack_isam.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/perror/perror_ia64.dsp b/VC++Files/perror/perror_ia64.dsp index 278b0ad292d..69fe18340dd 100644 --- a/VC++Files/perror/perror_ia64.dsp +++ b/VC++Files/perror/perror_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="perror - WinIA64 classic" +!MESSAGE NMAKE /f "perror_ia64.mak" CFG="perror - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -54,8 +54,8 @@ 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:IX86 /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 /nologo /subsystem:console /machine:IX86 /out:"../client_release/perror.exe" /machine:IA64 +# 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" @@ -71,8 +71,7 @@ LINK32=link.exe # 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 /GZ /G2 /EHsc /Wp64 /Zm600 /c -# SUBTRACT CPP /YX +# 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" @@ -81,8 +80,9 @@ 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 wsock32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /incremental:no /debug /machine:IA64 +# 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" @@ -110,8 +110,8 @@ 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 /machine:IX86 /out:"../client_release/perror.exe" /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 ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/perror.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/replace/replace_ia64.dsp b/VC++Files/replace/replace_ia64.dsp index 4167e9ef255..925af8d8081 100644 --- a/VC++Files/replace/replace_ia64.dsp +++ b/VC++Files/replace/replace_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="replace - WinIA64 classic" +!MESSAGE NMAKE /f "replace_ia64.mak" CFG="replace - WinIA64 classic" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -52,8 +52,8 @@ 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 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 /machine:IX86 /out:"../client_release/replace.exe" /machine:IA64 +# 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" @@ -78,8 +78,8 @@ 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 wsock32.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 /incremental:no /machine:IX86 /out:"../client_debug/replace.exe" /machine:IA64 +# 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" @@ -107,8 +107,8 @@ 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 /machine:IX86 /out:"../client_release/replace.exe" /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 ..\lib_release\mysys.lib ..\lib_release\strings.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/replace.exe" /libpath:"..\lib_release\\" /machine:IA64 +# 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 diff --git a/VC++Files/sql/mysqld_ia64.dsp b/VC++Files/sql/mysqld_ia64.dsp index 1b01e0d07bc..310f48fcfb9 100644 --- a/VC++Files/sql/mysqld_ia64.dsp +++ b/VC++Files/sql/mysqld_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="mysqld - WinIA64 pro nt" +!MESSAGE NMAKE /f "mysqld_ia64.mak" CFG="mysqld - WinIA64 pro nt" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -58,8 +58,8 @@ 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 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:IX86 /out:"../client_release/mysqld.exe" /machine:IA64 +# 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" @@ -85,8 +85,8 @@ 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 Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /out:"../client_debug/mysqld-debug.exe" /machine:IA64 +# 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" @@ -113,8 +113,8 @@ 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:IX86 /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\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:IX86 /out:"../client_release/mysqld-nt.exe" /machine:IA64 +# 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" @@ -142,9 +142,9 @@ 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:IX86 /machine:IA64 +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib /nologo /subsystem:console /map /machine:IX86 /out:"../client_release/mysqld-max-nt.exe" /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\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" @@ -172,8 +172,8 @@ 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:IX86 /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\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 /nologo /subsystem:console /machine:IX86 /out:"../client_release/mysqld-max.exe" /machine:IA64 +# 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" @@ -200,9 +200,9 @@ 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:IX86 /machine:IA64 +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/mysqld.exe" /libpath:"..\lib_release" /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\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" @@ -229,9 +229,9 @@ 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:IX86 /machine:IA64 +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_pro/mysqld.exe" /libpath:"..\lib_release" /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 /out:"../client_pro/mysqld.exe" /libpath:"..\lib_release" /machine:IA64 # SUBTRACT LINK32 /debug !ELSEIF "$(CFG)" == "mysqld - WinIA64 classic nt" @@ -259,9 +259,9 @@ 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:IX86 /machine:IA64 +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_classic/mysqld-nt.exe" /libpath:"..\lib_release" /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\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" @@ -288,9 +288,9 @@ 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:IX86 /machine:IA64 +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /machine:IX86 /out:"../client_pro/mysqld-nt.exe" /libpath:"..\lib_release" /machine:IA64 +# 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 diff --git a/VC++Files/sql/mysqldmax_ia64.dsp b/VC++Files/sql/mysqldmax_ia64.dsp index b9dd5d687a9..9d79d224e4a 100644 --- a/VC++Files/sql/mysqldmax_ia64.dsp +++ b/VC++Files/sql/mysqldmax_ia64.dsp @@ -53,8 +53,8 @@ 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:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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 /machine:I386 /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-opt.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" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 /machine:I386 /nodefaultlib:"LIBC" /out:"../client_debug/mysqld-max.exe" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_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" @@ -102,8 +102,8 @@ 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:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\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:I386 /nodefaultlib:"LIBC" /out:"../client_release/mysqld-max-nt.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" diff --git a/VC++Files/strings/strings_ia64.dsp b/VC++Files/strings/strings_ia64.dsp index 287eaaedd96..6449b2b1355 100644 --- a/VC++Files/strings/strings_ia64.dsp +++ b/VC++Files/strings/strings_ia64.dsp @@ -65,7 +65,7 @@ LIB32=link.exe -lib # 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 +# 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 diff --git a/VC++Files/test1/test1_ia64.dsp b/VC++Files/test1/test1_ia64.dsp index 2cb5dde46b5..6e283ac0224 100644 --- a/VC++Files/test1/test1_ia64.dsp +++ b/VC++Files/test1/test1_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="test1 - WinIA64 Debug" +!MESSAGE NMAKE /f "test1_ia64.mak" CFG="test1 - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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 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 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" @@ -77,8 +77,9 @@ 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 /nologo /subsystem:console /incremental:no /debug -machineÖIA64 /libpath:"..\lib_debug" /machine:IA64 +# 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 diff --git a/VC++Files/tests/mysql_client_test_ia64.dsp b/VC++Files/tests/mysql_client_test_ia64.dsp index 3a68a7406aa..6b4f29ed59f 100644 --- a/VC++Files/tests/mysql_client_test_ia64.dsp +++ b/VC++Files/tests/mysql_client_test_ia64.dsp @@ -2,18 +2,18 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win3 (x86) Console Application" 0x0103 +# 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.mak". +!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.mak" CFG="mysql_client_test - Win32 Release" +!MESSAGE NMAKE /f "mysql_client_test_ia64.mak" CFG="mysql_client_test - WinIA64 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -35,6 +35,7 @@ RSC=rc.exe # 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 @@ -47,9 +48,9 @@ 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 /machine:IA64 /out:"..\tests\mysql_client_test.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 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 /machine:IA64 /out:"..\tests\mysql_client_test.exe" /pdbtype:sept +# 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 @@ -57,6 +58,30 @@ LINK32=link.exe # 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 index 64aae03faaf..90b6ca02648 100644 --- a/VC++Files/thr_test/thr_test_ia64.dsp +++ b/VC++Files/thr_test/thr_test_ia64.dsp @@ -8,12 +8,12 @@ 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.mak". +!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.mak" CFG="thr_test - WinIA64 Debug" +!MESSAGE NMAKE /f "thr_test_ia64.mak" CFG="thr_test - WinIA64 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE @@ -51,8 +51,8 @@ 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 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 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" @@ -78,8 +78,8 @@ 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 /nologo /subsystem:console /incremental:no /debug /machine:IA64 +# 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 From f5e9b79c28284774a0c126670916ba247a7c4753 Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Mon, 7 Mar 2005 13:42:01 +0100 Subject: [PATCH 12/29] mysql-test-run to default run with ndbcluster if compiled with that support --- mysql-test/Makefile.am | 3 +++ mysql-test/mysql-test-run.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9426b20d09c..b2e86d8c00e 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) @@ -98,6 +100,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/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8c484d2ddb1..0562a15bd40 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -218,7 +218,7 @@ EXTRA_MYSQL_TEST_OPT="" EXTRA_MYSQLDUMP_OPT="" EXTRA_MYSQLBINLOG_OPT="" USE_RUNNING_SERVER="" -USE_NDBCLUSTER="" +USE_NDBCLUSTER=@USE_NDBCLUSTER@ USE_RUNNING_NDBCLUSTER="" USE_PURIFY="" PURIFY_LOGS="" From 24728104897219d92523f3a5c416f2f433476978 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Mon, 7 Mar 2005 13:59:28 +0100 Subject: [PATCH 13/29] Fixed crash if max_connections is exceeded. BUG#8996 --- sql/mysqld.cc | 1 + sql/protocol.cc | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fb9a1d70512..6fadc96bb20 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1432,6 +1432,7 @@ void close_connection(THD *thd, uint errcode, bool lock) errcode ? ER(errcode) : "")); if (lock) (void) pthread_mutex_lock(&LOCK_thread_count); + thd->killed=1; if ((vio=thd->net.vio) != 0) { if (errcode) diff --git a/sql/protocol.cc b/sql/protocol.cc index 4cecd016553..6bec4dbe47f 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -122,8 +122,9 @@ void send_error(THD *thd, uint sql_errno, const char *err) } VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length)); #endif /* EMBEDDED_LIBRARY*/ - push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_errno, - orig_err ? orig_err : ER(sql_errno)); + if (!thd->killed) + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_errno, + orig_err ? orig_err : ER(sql_errno)); thd->is_fatal_error=0; // Error message is given thd->net.report_error= 0; From dfab08eab003b4550c190c68e0ebb02f37d40ead Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Mon, 7 Mar 2005 14:28:09 +0100 Subject: [PATCH 14/29] mysql-test-run.sh: added skip-ndbcluster switch --- mysql-test/mysql-test-run.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 0562a15bd40..36d434c57d4 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -426,6 +426,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" From 69fe070acb1081c01053363b82a8703a9cd9a98b Mon Sep 17 00:00:00 2001 From: "heikki@hundin.mysql.fi" <> Date: Mon, 7 Mar 2005 15:28:10 +0200 Subject: [PATCH 15/29] trx0trx.c: Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free() --- innobase/trx/trx0trx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 2fdee94b089..8f409034df0 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -268,6 +268,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); From c36fa576c6ce632077036bbf2cca8748c58c5cb6 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Mon, 7 Mar 2005 16:45:19 +0100 Subject: [PATCH 16/29] additional safety --- sql/protocol.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/protocol.cc b/sql/protocol.cc index 6bec4dbe47f..773bbe697a3 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -252,8 +252,9 @@ net_printf(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) + 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; } From beea918092222adc26faac6d123c2c9019cd55bb Mon Sep 17 00:00:00 2001 From: "marko@hundin.mysql.fi" <> Date: Tue, 8 Mar 2005 11:12:18 +0200 Subject: [PATCH 17/29] InnoDB: Win64 portability fix: add missing declaration and correct the definition of srv_max_buf_pool_modified_pct. --- innobase/include/srv0srv.h | 1 + innobase/srv/srv0srv.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 30dd3db7bb1..e18ceb32bbe 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -101,6 +101,7 @@ extern ibool srv_use_doublewrite_buf; extern ibool srv_set_thread_priorities; extern int srv_query_thread_priority; +extern ulong srv_max_buf_pool_modified_pct; extern ulong srv_max_purge_lag; /*-------------------------------------------*/ diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 5c5d62f777b..6ac8727ee26 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -165,7 +165,7 @@ in the buffer pool to all database pages in the buffer pool smaller than the following number. But it is not guaranteed that the value stays below that during a time of heavy update/insert activity. */ -ulint srv_max_buf_pool_modified_pct = 90; +ulong srv_max_buf_pool_modified_pct = 90; /* If the following is != 0 we do not allow inserts etc. This protects the user from forgetting the innodb_force_recovery keyword to my.cnf */ From 56bc9cfacbf21b821c1fd33cbe4a74910465af05 Mon Sep 17 00:00:00 2001 From: "joreland@mysql.com" <> Date: Tue, 8 Mar 2005 10:25:21 +0100 Subject: [PATCH 18/29] bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout --- ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp index 089cf613b03..9eaa203b098 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; } From e09e0a154a59768fe3834963b2c4848569776a2b Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Tue, 8 Mar 2005 14:27:18 +0100 Subject: [PATCH 19/29] Post-merge manual fix. --- Build-tools/Do-compile | 1 - 1 file changed, 1 deletion(-) diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 3dd326b968c..e7ab3357de9 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -7,7 +7,6 @@ use Sys::Hostname; @config_options= (); @make_options= (); -$opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; $opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; $opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix=""; $opt_tmp=$opt_version_suffix=""; From 63d01ae103c5fb93ba26b1b030ec0a56e38ffcfb Mon Sep 17 00:00:00 2001 From: "marko@hundin.mysql.fi" <> Date: Tue, 8 Mar 2005 17:08:17 +0200 Subject: [PATCH 20/29] dict0load.c: dict_load_table(): Remove the check for row_format=compact for now, because the flag bit we used (high-order bit of mix_len) has not been zero for at least two customers. --- innobase/dict/dict0load.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c index 0bbf0511b57..a4637e09d07 100644 --- a/innobase/dict/dict0load.c +++ b/innobase/dict/dict0load.c @@ -647,22 +647,6 @@ dict_load_table( return(NULL); } -#if MYSQL_VERSION_ID < 50300 - /* 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 */ - ut_a(0 == ut_strcmp((char *) "SPACE", dict_field_get_col( dict_index_get_nth_field( From 633f50cbef4d1859242846e3c07f62ff89fff1e7 Mon Sep 17 00:00:00 2001 From: "jani@ua141d10.elisa.omakaista.fi" <> Date: Tue, 8 Mar 2005 18:32:31 +0200 Subject: [PATCH 21/29] Added possibility to add disabled tests to mysql-test-run. --- mysql-test/mysql-test-run.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 36d434c57d4..8231742abef 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -817,6 +817,18 @@ skip_test() { $ECHO "$RES$RES_SPACE [ skipped ]" } + +disable_test() { + USERT=" ...." + SYST=" ...." + REALT=" ...." + pname=`$ECHO "$1 "|$CUT -c 1-24` + RES="$pname" + skip_inc + $ECHO "$RES$RES_SPACE [ disabled ] $2" +} + + report_current_test () { tname=$1 echo "CURRENT_TEST: $tname" >> $MASTER_MYERR @@ -1471,6 +1483,12 @@ run_testcase () if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then result_file="$result_file$RESULT_EXT" fi + if [ -f "$TESTDIR/$tname.disabled" ] + then + comment=`$CAT $TESTDIR/$tname.disabled`; + disable_test $tname "$comment" + return + fi if [ "$USE_MANAGER" = 1 ] ; then many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)` fi From 172294e92e0ec15a63208ad68a1adb591186eb01 Mon Sep 17 00:00:00 2001 From: "Sinisa@sinisa.nasamreza.org" <> Date: Tue, 8 Mar 2005 20:06:08 +0200 Subject: [PATCH 22/29] Fix to make builds possible --- mysql-test/r/mysqldump.result | 14 -------------- mysql-test/t/mysqldump.test | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 427efb52a21..69ca9486d2f 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -530,11 +530,6 @@ DROP TABLE t1; DROP TABLE t2; CREATE TABLE t1 (`b` blob); INSERT INTO `t1` VALUES (0x602010000280100005E71A); --- MySQL dump 10.9 --- --- Host: localhost Database: test --- ------------------------------------------------------ --- Server version 4.1.11-debug-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -544,20 +539,11 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A); /*!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 */; - --- --- Table structure for table `t1` --- - DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( `b` blob ) ENGINE=MyISAM DEFAULT CHARSET=latin1; --- --- Dumping data for table `t1` --- - /*!40000 ALTER TABLE `t1` DISABLE KEYS */; LOCK TABLES `t1` WRITE; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index a9217f3373a..f753e9dcf29 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -179,6 +179,6 @@ DROP TABLE t2; CREATE TABLE t1 (`b` blob); INSERT INTO `t1` VALUES (0x602010000280100005E71A); ---exec $MYSQL_DUMP --skip-extended-insert --hex-blob test t1 +--exec $MYSQL_DUMP --skip-extended-insert --hex-blob test --skip-comments t1 DROP TABLE t1; From 2bfe8843204cb90ec00e9ead342ea494b86a2c90 Mon Sep 17 00:00:00 2001 From: "marko@hundin.mysql.fi" <> Date: Tue, 8 Mar 2005 20:06:09 +0200 Subject: [PATCH 23/29] dict0load.c: dict_load_table(): Do not complain about mix_len != 0, because MySQL 3.23.4x left garbage in that column. --- innobase/dict/dict0load.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c index 26e92afabe0..7297fcadfa5 100644 --- a/innobase/dict/dict0load.c +++ b/innobase/dict/dict0load.c @@ -729,7 +729,6 @@ dict_load_table( ulint space; ulint n_cols; ulint err; - ulint mix_len; mtr_t mtr; #ifdef UNIV_SYNC_DEBUG @@ -776,22 +775,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(rec, 7, &len); - ut_a(len == 4); - - mix_len = mach_read_from_4(field); - - if (mix_len != 0) { - ut_print_timestamp(stderr); - - fprintf(stderr, - " InnoDB: table %s has a nonsensical mix len %lu\n", - name, (ulong)mix_len); - } - ut_a(0 == ut_strcmp("SPACE", dict_field_get_col( dict_index_get_nth_field( From 9272081ebbd6303ca6abbc0f24141b8d942002d3 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Tue, 8 Mar 2005 19:45:55 +0100 Subject: [PATCH 24/29] BUG#6635 - test_if_skip_sort_order() thought it can skip filesort for fulltext searches too --- mysql-test/r/fulltext_order_by.result | 8 ++++++++ mysql-test/t/fulltext_order_by.test | 8 ++++++++ sql/sql_select.cc | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) 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/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/sql/sql_select.cc b/sql/sql_select.cc index 23ebd0ee637..b00f9e422a1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7142,7 +7142,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 From 3a81683c057f6a69e687397efc254289c3d98ba9 Mon Sep 17 00:00:00 2001 From: "paul@kite-hub.kitebird.com" <> Date: Tue, 8 Mar 2005 13:13:15 -0600 Subject: [PATCH 25/29] changelog-4.1.xml: Add dummy changelog file. It should merge upward without conflict. --- Docs/changelog-4.1.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 Docs/changelog-4.1.xml 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 @@ + + + + + + + Changes in release 4.1.x + + + + This is a dummy changelog file. Don't use it yet. + + + From fa001505e3483952670037e40b9e81cc0e60ea4a Mon Sep 17 00:00:00 2001 From: "marko@hundin.mysql.fi" <> Date: Tue, 8 Mar 2005 22:33:11 +0200 Subject: [PATCH 26/29] mysqld.cc: main(): add missing parameter to printf(ER(ER_READY),...) call --- sql/mysqld.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6fadc96bb20..f6ba950701a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3085,9 +3085,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); printf(ER(ER_READY),my_progname,server_version, ((unix_sock == INVALID_SOCKET) ? (char*) "" : mysqld_unix_port), - mysqld_port); - if (MYSQL_COMPILATION_COMMENT[0] != '\0') - fputs(" " MYSQL_COMPILATION_COMMENT, stdout); + mysqld_port, MYSQL_COMPILATION_COMMENT); putchar('\n'); fflush(stdout); From c6002966be64f522a431d18e444b3344665e90b0 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 9 Mar 2005 01:34:22 +0100 Subject: [PATCH 27/29] mysql-test-run.pl: Removed -c from /bin/sh call make_win_src_distribution.sh: Copy all content in mysql-test make_win_binary_distribution.sh, make_binary_distribution.sh: Add Perl version of mysql-test-run to package s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah: Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris --- bdb/dist/s_java | 2 +- bdb/dist/s_javah | 2 +- bdb/dist/s_readme | 2 +- bdb/dist/s_test | 2 +- bdb/dist/s_vxworks | 2 +- bdb/dist/s_win32 | 2 +- bdb/dist/s_win32_dsp | 6 ++++-- mysql-test/mysql-test-run.pl | 18 ++++++++++++++---- scripts/make_binary_distribution.sh | 8 +++++--- scripts/make_win_binary_distribution.sh | 4 ++++ scripts/make_win_src_distribution.sh | 4 ++-- 11 files changed, 35 insertions(+), 17 deletions(-) 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/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 795df3623b0..f8adf372585 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1535,6 +1535,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*"); } @@ -1548,8 +1549,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); @@ -1566,6 +1571,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?! @@ -1576,8 +1582,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/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 70eff2db79b..01d635688d8 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 \ @@ -207,7 +207,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 ] @@ -216,6 +216,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/*.*001 $BASE/mysql-test/std_data $CP mysql-test/std_data/des_key_file $BASE/mysql-test/std_data @@ -242,7 +244,7 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_ # Copy system dependent files # if [ $BASE_SYSTEM = "netware" ] ; then -echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql + echo "CREATE DATABASE mysql;" > $BASE/bin/init_db.sql echo "CREATE DATABASE test;" >> $BASE/bin/init_db.sql sh ./scripts/mysql_create_system_tables.sh real "" "%" 0 >> $BASE/bin/init_db.sql sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 > $BASE/bin/test_db.sql 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 16a033b8de4..b52cc3799aa 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 @@ -305,7 +305,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 ] From 73eea6dde9db8f7c64cf82dc649d6cc564960cd4 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Wed, 9 Mar 2005 02:53:00 +0100 Subject: [PATCH 28/29] configure.in: bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists --- configure.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d6acef071a6..305e9d44cec 100644 --- a/configure.in +++ b/configure.in @@ -1840,7 +1840,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) From 0279cd50d91210956c8838b717497d97a9b16702 Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Wed, 9 Mar 2005 12:59:20 +0100 Subject: [PATCH 29/29] myisam/myisam_ftdump.c recalculate stats/gws for the last word in the index too remove unused code --- myisam/myisam_ftdump.c | 190 +++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 100 deletions(-) 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 ; indocs ; 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=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= 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();