Commit 55785063 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
netware/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  Auto merged
mysql-test/install_test_db.sh:
  SCCS merged
parents efd32593 e5f2e263

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1763,7 +1763,9 @@ netware/.deps/my_manage.Po 
netware/.deps/mysql_install_db.Po

netware/.deps/mysql_test_run.Po

netware/.deps/mysqld_safe.Po

netware/init_db.sql

netware/libmysql.imp

netware/test_db.sql

pack_isam/*.ds?

perror/*.ds?

perror/*.vcproj

extra/yassl/taocrypt/taocrypt.vcproj

+16 −374
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\Debug"

			IntermediateDirectory=".\Debug"

			OutputDirectory=".\debug_obj"

			IntermediateDirectory=".\debug_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,16 +21,17 @@ 
			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,mySTL"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

				ExceptionHandling="FALSE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\Debug/taocrypt.pch"

				AssemblerListingLocation=".\Debug/"

				ObjectFile=".\Debug/"

				ProgramDataBaseFileName=".\Debug/"

				PrecompiledHeaderFile=".\debug_obj/taocrypt.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				BrowseInformation="1"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"
@@ -40,7 +41,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\Debug\taocrypt.lib"

				OutputFile=".\debug_obj\taocrypt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -65,8 +66,8 @@ 
		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\Release"

			IntermediateDirectory=".\Release"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -75,6 +76,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,mySTL"

				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

				StringPooling="TRUE"
@@ -82,10 +84,10 @@ 
				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\Release/taocrypt.pch"

				AssemblerListingLocation=".\Release/"

				ObjectFile=".\Release/"

				ProgramDataBaseFileName=".\Release/"

				PrecompiledHeaderFile=".\release_obj/taocrypt.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>
@@ -93,7 +95,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\Release\taocrypt.lib"

				OutputFile=".\release_obj\taocrypt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -125,423 +127,63 @@ 
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath="src\aes.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\aestables.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\algebra.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\arc4.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\asn.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\coding.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\des.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\dh.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\dsa.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\file.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\hash.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\integer.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\md2.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\md4.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\md5.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\misc.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\random.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\ripemd.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\rsa.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\sha.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

		</Filter>

		<Filter

extra/yassl/yassl.vcproj

+16 −230
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\Debug"

			IntermediateDirectory=".\Debug"

			OutputDirectory=".\debug_obj"

			IntermediateDirectory=".\debug_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,16 +21,17 @@ 
			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;YASSL_PREFIX"

				ExceptionHandling="FALSE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\Debug/yassl.pch"

				AssemblerListingLocation=".\Debug/"

				ObjectFile=".\Debug/"

				ProgramDataBaseFileName=".\Debug/"

				PrecompiledHeaderFile=".\debug_obj/yassl.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				BrowseInformation="1"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"
@@ -40,7 +41,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\Debug\yassl.lib"

				OutputFile=".\debug_obj\yassl.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -65,8 +66,8 @@ 
		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\Release"

			IntermediateDirectory=".\Release"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -75,6 +76,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL"

				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;YASSL_PREFIX"

				StringPooling="TRUE"
@@ -82,10 +84,10 @@ 
				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\Release/yassl.pch"

				AssemblerListingLocation=".\Release/"

				ObjectFile=".\Release/"

				ProgramDataBaseFileName=".\Release/"

				PrecompiledHeaderFile=".\release_obj/yassl.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>
@@ -93,7 +95,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\Release\yassl.lib"

				OutputFile=".\release_obj\yassl.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -125,255 +127,39 @@ 
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

			<File

				RelativePath="src\buffer.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\cert_wrapper.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\crypto_wrapper.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\handshake.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\lock.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\log.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\socket_wrapper.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\ssl.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\timer.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\yassl_error.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\yassl_imp.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="src\yassl_int.cpp">

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BasicRuntimeChecks="3"

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

		</Filter>

		<Filter

mysql-test/install_test_db.sh

+8 −9
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ if [ x$1 = x"--bin" ]; then 
  BINARY_DIST=1



  bindir=../bin

  scriptdir=../bin

  scriptdir=bin

  libexecdir=../libexec



  # Check if it's a binary distribution or a 'make install'
@@ -33,7 +33,7 @@ if [ x$1 = x"--bin" ]; then 
  then

    execdir=../../sbin

    bindir=../../bin

    scriptdir=../../bin

    scriptdir=../bin

    libexecdir=../../libexec

  else

    execdir=../bin
@@ -43,7 +43,7 @@ else 
  execdir=../sql

  bindir=../client

  fix_bin=.

  scriptdir=../scripts

  scriptdir=scripts

  libexecdir=../libexec

fi
@@ -99,15 +99,14 @@ if [ x$BINARY_DIST = x1 ] ; then 
basedir=..

else

basedir=.

EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"

EXTRA_ARG="--windows"

fi



mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"



mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

echo "running $mysqld_boot"

INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."

echo "running $INSTALL_CMD"



if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot

cd ..

if $INSTALL_CMD

then

    exit 0

else

mysql-test/mysql-test-run.pl

+11 −3
Original line number Diff line number Diff line
@@ -1496,8 +1496,16 @@ sub executable_setup () { 
  if (!$opt_extern)

  {

    # Look for SQL scripts directory

    if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "")

    {

      # The SQL scripts are in path_share

      $path_sql_dir= $path_share;

    }

    else

    {

      $path_sql_dir= mtr_path_exists("$glob_basedir/share",

				     "$glob_basedir/scripts");

    }



    if ( $mysql_version_id >= 50100 )

    {