Commit 6bb78b95 authored by unknown's avatar unknown
Browse files

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
parents 971124a7 23fa1ee8

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1337,3 +1337,5 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

netware/init_db.sql

netware/test_db.sql

Makefile.am

+32 −4
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ tags: 
.PHONY:	init-db bin-dist \

  test    test-force    test-full    test-force-full    test-force-mem \

  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-ps test-ns

  test-ps test-ns test-ext-funcs test-ext \

  test-fast test-fast-cursor test-fast-view test-fast-prepare \

  test-full-qa



# Target 'test' will run the regression test suite using the built server.

#
@@ -124,11 +126,11 @@ tags: 


test-ps:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol

	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol



test-ns:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force)

	@PERL@ ./mysql-test-run.pl $(force) $(mem)



test:	test-ns test-ps
@@ -143,7 +145,7 @@ test-force-full: 


#used by autopush.pl to run memory based tests

test-force-mem:

	$(MAKE) 'force=--force --mem' test

	$(MAKE) force=--force mem=--mem test



# Keep these for a while

test-pl:	test
@@ -152,5 +154,31 @@ test-force-pl: test-force 
test-force-pl-mem:  test-force-mem

test-force-full-pl: test-force-full



test-ext-funcs:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \

	@PERL@ ./mysql-test-run.pl --force --suite=funcs_2



test-ext:	test-ext-funcs



test-fast:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \

	@PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam



test-fast-view:

	$(MAKE) subset=--view-protocol test-fast



test-fast-cursor:

	$(MAKE) subset=--cursor-protocol test-fast



test-fast-prepare:

	$(MAKE) subset=--ps-protocol test-fast



test-full-qa:

	$(MAKE) force=--force test-pl \

	test-ext test-fast-view \

	test-fast-cursor



# Don't update the files from bitkeeper

%::SCCS/s.%

VC++Files/bdb/bdb.vcproj

+15 −2623

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/client/mysql.vcproj

+18 −178
Original line number Diff line number Diff line
@@ -10,74 +10,10 @@ 
			Name="Win32"/>

	</Platforms>

	<Configurations>

		<Configuration

			Name="classic|Win32"

			OutputDirectory=".\classic"

			IntermediateDirectory=".\classic"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

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

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

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\classic/mysql.pch"

				AssemblerListingLocation=".\classic/"

				ObjectFile=".\classic/"

				ProgramDataBaseFileName=".\classic/"

				WarningLevel="3"

				WarnAsError="TRUE"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_classic/mysql.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\classic/mysql.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\classic/mysql.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release"

			IntermediateDirectory=".\release"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -92,19 +28,20 @@ 
				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysql.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				PrecompiledHeaderFile=".\release_obj/mysql.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_release/mysql.exe"

				OutputFile=".\release/mysql.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""
@@ -114,7 +51,7 @@ 
				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/mysql.tlb"

				TypeLibraryName=".\release_obj/mysql.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>
@@ -139,8 +76,8 @@ 
		</Configuration>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\debug"

			IntermediateDirectory=".\debug"

			OutputDirectory=".\debug_obj"

			IntermediateDirectory=".\debug_obj"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -151,11 +88,12 @@ 
				OptimizeForProcessor="2"

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

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

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysql.pch"

				AssemblerListingLocation=".\debug/"

				ObjectFile=".\debug/"

				ProgramDataBaseFileName=".\debug/"

				PrecompiledHeaderFile=".\debug_obj/mysql.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"
@@ -165,7 +103,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_debug/mysql.exe"

				OutputFile=".\debug/mysql.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""
@@ -175,7 +113,7 @@ 
				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\debug/mysql.tlb"

				TypeLibraryName=".\debug_obj/mysql.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>
@@ -204,113 +142,15 @@ 
	<Files>

		<File

			RelativePath="completion_hash.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="mysql.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					DebugInformationFormat="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					DebugInformationFormat="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="readline.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="sql_string.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>

VC++Files/client/mysql_upgrade.vcproj

+19 −103
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="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -24,11 +24,12 @@ 
				OptimizeForProcessor="2"

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

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

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysql_upgrade.pch"

				AssemblerListingLocation=".\debug/"

				ObjectFile=".\debug/"

				ProgramDataBaseFileName=".\debug/"

				PrecompiledHeaderFile=".\debug_obj/mysql_upgrade.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"
@@ -38,7 +39,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"

				OutputFile="../client_debug/mysql_upgrade.exe"

				OutputFile=".\debug/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""
@@ -48,7 +49,7 @@ 
				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\debug/mysql_upgrade.tlb"

				TypeLibraryName=".\debug_obj/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>
@@ -73,8 +74,8 @@ 
		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release"

			IntermediateDirectory=".\release"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -85,23 +86,24 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

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

				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"

				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysql_upgrade.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				PrecompiledHeaderFile=".\release_obj/mysql_upgrade.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_release/mysql_upgrade.exe"

				OutputFile=".\release/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""
@@ -110,69 +112,7 @@ 
				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="classic|Win32"

			OutputDirectory=".\classic"

			IntermediateDirectory=".\classic"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

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

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

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\classic/mysql_upgrade.pch"

				AssemblerListingLocation=".\classic/"

				ObjectFile=".\classic/"

				ProgramDataBaseFileName=".\classic/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_classic/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				ProgramDatabaseFile=".\classic/mysql_upgrade.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\classic/mysql_upgrade.tlb"

				TypeLibraryName=".\release_obj/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>
@@ -201,30 +141,6 @@ 
	<Files>

		<File

			RelativePath="mysql_upgrade.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>