Commit 74866578 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

parents cb761d3a 617053a4
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
				Optimization="2"
				InlineFunctionExpansion="1"
				OptimizeForProcessor="2"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"
				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;WITH_PARTITION_STORAGE_ENGINE"
				StringPooling="TRUE"
				RuntimeLibrary="0"
@@ -72,7 +72,7 @@
				Name="VCCLCompilerTool"
				Optimization="0"
				OptimizeForProcessor="2"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"
				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"
				StringPooling="TRUE"
				RuntimeLibrary="1"
@@ -122,7 +122,7 @@
				Optimization="2"
				InlineFunctionExpansion="1"
				OptimizeForProcessor="2"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"
				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS;WITH_PARTITION_STORAGE_ENGINE"
				StringPooling="TRUE"
				RuntimeLibrary="0"
@@ -171,7 +171,7 @@
				Name="VCCLCompilerTool"
				Optimization="0"
				OptimizeForProcessor="2"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql"
				AdditionalIncludeDirectories="../../include,../../regex,../../sql,../../extra/yassl/include"
				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;WITH_PARTITION_STORAGE_ENGINE"
				StringPooling="TRUE"
				RuntimeLibrary="1"