From 46d02a2c01e2a102e827f9c9491b3447ed4d76bc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 19 Mar 2007 22:41:16 +0100 Subject: [PATCH 1/2] mysys.vcproj: Removed accidently added my_winsem.c make_win_bin_dist: Corrected test for relwithdebinfo target mysql.sln: Specify that comp_err depends on zlib VC++Files/mysys/mysys.vcproj: Removed accidently added my_winsem.c VC++Files/mysql.sln: Specify that comp_err depends on zlib scripts/make_win_bin_dist: Corrected test for relwithdebinfo target --- VC++Files/mysql.sln | 1 + VC++Files/mysys/mysys.vcproj | 3 --- scripts/make_win_bin_dist | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln index 22f274ef7f6..31b9232e2ec 100644 --- a/VC++Files/mysql.sln +++ b/VC++Files/mysql.sln @@ -4,6 +4,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comp_err", "comp_err\comp_e {EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859} {44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF} {FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE} + {8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbug", "dbug\dbug.vcproj", "{FC369DF4-AEB7-4531-BF34-A638C4363BFE}" diff --git a/VC++Files/mysys/mysys.vcproj b/VC++Files/mysys/mysys.vcproj index e17b57675ac..e1f7a03e9dc 100644 --- a/VC++Files/mysys/mysys.vcproj +++ b/VC++Files/mysys/mysys.vcproj @@ -590,9 +590,6 @@ - - diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index a674fe08362..59018195ef2 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -132,7 +132,7 @@ trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR # Adjust target name if needed, release with debug info has another name # ---------------------------------------------------------------------- -if [ x"$TARGET" = x"release" -a "client/relwithdebinfo/mysql.exe" ] +if [ x"$TARGET" = x"release" -a -f "client/relwithdebinfo/mysql.exe" ] then TARGET="relwithdebinfo" fi From e1d8f329fa474e8b7a2610f45723da2ec2c07e0c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Mar 2007 15:12:50 +0100 Subject: [PATCH 2/2] vio.vcproj, mysqld.vcproj, mysys.vcproj, libmysqld.vcproj, mysqldemb.vcproj: No need to set LICENSE or USE_SYMDIR from project files make_win_bin_dist: Changed location of SQL initialization files to be "share/" scripts/make_win_bin_dist: Changed location of SQL initialization files to be "share/" VC++Files/libmysqld/libmysqld.vcproj: No need to set LICENSE or USE_SYMDIR from project files VC++Files/mysqldemb/mysqldemb.vcproj: No need to set LICENSE or USE_SYMDIR from project files VC++Files/mysys/mysys.vcproj: No need to set LICENSE or USE_SYMDIR from project files VC++Files/sql/mysqld.vcproj: No need to set LICENSE or USE_SYMDIR from project files VC++Files/vio/vio.vcproj: No need to set LICENSE or USE_SYMDIR from project files --- VC++Files/libmysqld/libmysqld.vcproj | 20 ++++++++++---------- VC++Files/mysqldemb/mysqldemb.vcproj | 20 ++++++++++---------- VC++Files/mysys/mysys.vcproj | 6 +++--- VC++Files/sql/mysqld.vcproj | 8 ++++---- VC++Files/vio/vio.vcproj | 2 +- scripts/make_win_bin_dist | 3 +++ 6 files changed, 31 insertions(+), 28 deletions(-) diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index 94447791753..4248522d2ff 100644 --- a/VC++Files/libmysqld/libmysqld.vcproj +++ b/VC++Files/libmysqld/libmysqld.vcproj @@ -23,7 +23,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj/libmysqld.pch" @@ -90,7 +90,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib" - PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj98/libmysqld.pch" @@ -158,7 +158,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -225,7 +225,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib" - PreprocessorDefinitions="DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -292,7 +292,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -358,7 +358,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" @@ -426,7 +426,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -492,7 +492,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" @@ -560,7 +560,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -626,7 +626,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../extra/yassl/include,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" diff --git a/VC++Files/mysqldemb/mysqldemb.vcproj b/VC++Files/mysqldemb/mysqldemb.vcproj index 82fc15f6503..e4ba2cca19b 100644 --- a/VC++Files/mysqldemb/mysqldemb.vcproj +++ b/VC++Files/mysqldemb/mysqldemb.vcproj @@ -23,7 +23,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../zlib,../include,../regex,../libmysqld,../sql" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj/mysqldemb.pch" @@ -74,7 +74,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../zlib,../include,../regex,../libmysqld,../sql" - PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj98/mysqldemb.pch" @@ -126,7 +126,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -179,7 +179,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE" + PreprocessorDefinitions="DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -232,7 +232,7 @@ InlineFunctionExpansion="1" OptimizeForEnterprisecessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -284,7 +284,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" @@ -337,7 +337,7 @@ InlineFunctionExpansion="1" OptimizeForEnterprisecessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -389,7 +389,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" @@ -442,7 +442,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -494,7 +494,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_SYMDIR;USE_TLS;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_LIB;EMBEDDED_LIBRARY;HAVE_DLOPEN;SIGNAL_WITH_VIO_CLOSE;USE_TLS;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" EnableFunctionLevelLinking="TRUE" diff --git a/VC++Files/mysys/mysys.vcproj b/VC++Files/mysys/mysys.vcproj index e1f7a03e9dc..53b5394b27d 100644 --- a/VC++Files/mysys/mysys.vcproj +++ b/VC++Files/mysys/mysys.vcproj @@ -22,7 +22,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj/mysys.pch" AssemblerListingLocation=".\debug_obj/" @@ -70,7 +70,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../zlib" - PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj98/mysys.pch" AssemblerListingLocation=".\debug_obj98/" @@ -218,7 +218,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../zlib" - PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR;USE_TLS" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS" RuntimeLibrary="1" PrecompiledHeaderFile=".\TLS_DEBUG/mysys.pch" AssemblerListingLocation=".\TLS_DEBUG/" diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 347eb578a42..97468c2045b 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -408,7 +408,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -472,7 +472,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;HAVE_INNOBASE_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\enterprise_debug_obj/mysqld.pch" @@ -536,7 +536,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -600,7 +600,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;HAVE_DLOPEN;_WINDOWS;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="1" PrecompiledHeaderFile=".\classic_debug_obj/mysqld.pch" diff --git a/VC++Files/vio/vio.vcproj b/VC++Files/vio/vio.vcproj index 9d66765af5d..b174ed52714 100644 --- a/VC++Files/vio/vio.vcproj +++ b/VC++Files/vio/vio.vcproj @@ -73,7 +73,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../extra/yassl/include" - PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug_obj/vio.pch" AssemblerListingLocation=".\debug_obj/" diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 59018195ef2..5d4c7ab917d 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -360,6 +360,9 @@ fi cp -pR sql-bench $DESTDIR/ rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile* +# The SQL initiation code is really expected to be in "share" +mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true + # ---------------------------------------------------------------------- # Copy other files specified on command line DEST=SOURCE # ----------------------------------------------------------------------