Commit 8280d204 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release 

into mysql.com:/data0/mysqldev/my/mysql-5.1.3-fixes
parents 68e89d69 e040ac61

BUILD/compile-dist

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ fi 
# Make sure to enable all features that affect "make dist"

./configure \

  --with-embedded-server \

  --with-archive-storage-engine \

  --with-blackhole-storage-engine \

  --with-csv-storage-engine \

  --with-example-storage-engine \

  --with-federated-storage-engine \

  --with-berkeley-db \

  --with-innodb \

  --enable-thread-safe-client \

VC++Files/libmysqld/libmysqld.vcproj

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib"

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

				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"
@@ -156,7 +156,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib"

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

				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__"

				StringPooling="TRUE"

				RuntimeLibrary="0"

VC++Files/myisam_ftdump/myisam_ftdump.vcproj

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

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/myisam_ftdump.pch"
@@ -83,7 +83,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -140,7 +140,7 @@ 
			Name="Source Files"

			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath="..\myisam\myisam_ftdump.c">

				RelativePath="..\storage\myisam\myisam_ftdump.c">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

VC++Files/myisamchk/myisamchk.vcproj

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -84,7 +84,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -146,7 +146,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/myisamchk.pch"
@@ -202,7 +202,7 @@ 
			Name="Source Files"

			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath="..\myisam\myisamchk.c">

				RelativePath="..\storage\myisam\myisamchk.c">

				<FileConfiguration

					Name="Release|Win32">

					<Tool

VC++Files/myisamlog/myisamlog.vcproj

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

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\Debug/myisamlog.pch"
@@ -83,7 +83,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -146,7 +146,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../myisam"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -202,7 +202,7 @@ 
			Name="Source Files"

			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath="..\myisam\myisamlog.c">

				RelativePath="..\storage\myisam\myisamlog.c">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool