Commit ad45b9a1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/home/pem/work/bug7049/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents c8a2ff6f 06f10b7f

BUILD/compile-pentium64-valgrind-max

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

BitKeeper/etc/config

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

[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

checkout:edit

eoln:unix

VC++Files/isam/isam.vcproj

0 → 100644
+1283 −0

File added.

Preview size limit exceeded, changes collapsed.

VC++Files/isamchk/isamchk.vcproj

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

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="isamchk"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			Name="Win32"/>

	</Platforms>

	<Configurations>

		<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,../myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS;_MBCS"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/isamchk.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib setargv.obj"

				OutputFile="../client_release/isamchk.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				ProgramDatabaseFile=".\release/isamchk.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/isamchk.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,../myisam"

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

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\classic/isamchk.pch"

				AssemblerListingLocation=".\classic/"

				ObjectFile=".\classic/"

				ProgramDataBaseFileName=".\classic/"

				BrowseInformation="1"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib setargv.obj"

				OutputFile="../client_classic/isamchk.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\lib_release\"

				ProgramDatabaseFile=".\classic/isamchk.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\classic/isamchk.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,../myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/isamchk.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 setargv.obj"

				OutputFile="../client_debug/isamchk.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/isamchk.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\debug/isamchk.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>

		<Filter

			Name="Source Files"

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

			<File

				RelativePath="..\isam\isamchk.c">

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

				<FileConfiguration

					Name="classic|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

			<File

				RelativePath="..\isam\sort.c">

				<FileConfiguration

					Name="Release|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

				<FileConfiguration

					Name="classic|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="2"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""

						BrowseInformation="1"/>

				</FileConfiguration>

				<FileConfiguration

					Name="Debug|Win32">

					<Tool

						Name="VCCLCompilerTool"

						Optimization="0"

						AdditionalIncludeDirectories=""

						PreprocessorDefinitions=""/>

				</FileConfiguration>

			</File>

		</Filter>

		<Filter

			Name="Header Files"

			Filter="h;hpp;hxx;hm;inl">

		</Filter>

		<Filter

			Name="Resource Files"

			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

		</Filter>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>

VC++Files/mysql.sln

+399 −27

File changed.

Preview size limit exceeded, changes collapsed.