Commit 05414133 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 

into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
parents 154434ae 9cc7d75e

BUILD/compile-pentium64-valgrind-max

0 → 100755
+29 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



# We want to test isam when building with valgrind

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam --with-embedded-server --with-openssl --with-raid --with-ndbcluster"



. "$path/FINISH.sh"



if test -z "$just_print"

then

  set +v +x

  echo "\

******************************************************************************

Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with

--enable-assembler. When Valgrind detects an error involving an assembly

function (for example an uninitialized value used as an argument of an

assembly function), Valgrind will not print the stacktrace and 'valgrind

--gdb-attach=yes' will not work either. If you need a stacktrace in those

cases, you have to run BUILD/compile-pentium-valgrind-max with the

--disable-assembler argument.

******************************************************************************"

fi

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -72,5 +72,6 @@ hours: 
[nick:]checkout:get

[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

checkout:edit

eoln:unix

Makefile.am

+13 −2
Original line number Diff line number Diff line
@@ -106,12 +106,12 @@ MYSQL_TEST_NDB_PORT = 9350 


test:

	cd mysql-test ; \

	./mysql-test-run.pl \

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run.pl --ps-protocol \

	./mysql-test-run --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
@@ -121,3 +121,14 @@ test-force: 
	cd mysql-test; \

	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force



# We are testing a new Perl version of the test script

test-pl:

	cd mysql-test; \

	./mysql-test-run.pl && \

	./mysql-test-run.pl --ps-protocol



test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force ; \

	./mysql-test-run.pl --ps-protocol --force

VC++Files/bdb/bdb.vcproj

0 → 100644
+3227 −0

File added.

Preview size limit exceeded, changes collapsed.

VC++Files/client/mysql.vcproj

0 → 100644
+318 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="Windows-1252"?>

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="mysql"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			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"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

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

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysql.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

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

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

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\release/mysql.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/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="Debug|Win32"

			OutputDirectory=".\debug"

			IntermediateDirectory=".\debug"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

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

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysql.pch"

				AssemblerListingLocation=".\debug/"

				ObjectFile=".\debug/"

				ProgramDataBaseFileName=".\debug/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

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

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

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/mysql.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\debug/mysql.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="_DEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

	</Configurations>

	<References>

	</References>

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

	</Globals>

</VisualStudioProject>