Commit 8eeb6b9d authored by unknown's avatar unknown
Browse files

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

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
parents 23812db6 32744399

.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

Makefile.am

+45 −4
Original line number Diff line number Diff line
@@ -97,7 +97,10 @@ 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-unit test-ps test-nr test-pr test-ns test-binlog-statement

  test-unit test-ps test-nr test-pr test-ns test-binlog-statement \

  test-ext-funcs test-ext-rpl test-ext-partitions 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.

#
@@ -120,11 +123,11 @@ test-nr: 


test-pr:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row

	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row



test-ns:

	cd mysql-test ; \

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed

	@PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed



test-binlog-statement:

	cd mysql-test ; \
@@ -142,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
@@ -151,5 +154,43 @@ 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-rpl:

	cd mysql-test ; \

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



test-ext-partitions:

	cd mysql-test ; \

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



test-ext-jp:

	cd mysql-test ; \

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



test-ext:	test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp



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-pr \

	test-binlog-statement test-ext test-fast-view \

	test-fast-cursor test-unit



# Don't update the files from bitkeeper

%::SCCS/s.%

client/echo.c

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 


   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   the Free Software Foundation; version 2 of the License.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

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

File changed.

Preview size limit exceeded, changes collapsed.