Commit 77d7fd80 authored by unknown's avatar unknown
Browse files

Merge 


client/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
client/mysqlimport.c:
  SCCS merged
parents 1c16fb14 4bc61ff9

VC++Files/client/mysqlclient.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -73,7 +73,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG;CHECK_LICENSE;LICENSE=Commercial"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT;CHECK_LICENSE;LICENSE=Commercial"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -122,7 +122,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				PreprocessorDefinitions="_DEBUG;__WIN__;_WINDOWS;SAFEMALLOC;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqlclient.pch"

				AssemblerListingLocation=".\debug/"

VC++Files/dbug/dbug.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX;USE_TLS"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\dbug___Win32_TLS_DEBUG/dbug.pch"
@@ -72,7 +72,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"

				PreprocessorDefinitions="__WIN__;_WINDOWS;NDEBUG;DBUG_OFF"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -121,7 +121,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/dbug.pch"

VC++Files/libmysql/libmysql.vcproj

+226 −226

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/libmysqld/libmysqld.vcproj

+492 −492

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/mysqlserver/mysqlserver.vcproj

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,libmysqld"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_INNOBASE_STORAGE_ENGINE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"
@@ -74,7 +74,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,../libmysqld"

				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_BERKELEY_DB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"

				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;DBUG_OFF;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_INNOBASE_STORAGE_ENGINE"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"