Commit 2a5aa3f2 authored by unknown's avatar unknown
Browse files

mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: 

  Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file


VC++Files/mysql.sln:
  Added "client/mysqlslap"
netware/Makefile.am:
  Added "client/mysqlslap"
scripts/make_binary_distribution.sh:
  Added "client/mysqlslap"
support-files/mysql.spec.sh:
  Added "client/mysqlslap"
parent a5ecdeba

VC++Files/client/mysqlslap.vcproj

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

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="mysqlslap"

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

				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysqlslap.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/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				ProgramDatabaseFile=".\release/mysqlslap.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/mysqlslap.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/mysqlslap.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/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				ProgramDatabaseFile=".\classic/mysqlslap.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

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

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqlslap.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/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/mysqlslap.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

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

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|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>

VC++Files/mysql.sln

+39 −0
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlsh 
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlslap.vcproj", "{3737BFE2-EF25-464F-994D-BD28A9F84529}"

	ProjectSection(ProjectDependencies) = postProject

		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}

		{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}

		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}

		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yassl", "extra\yassl\yassl.vcproj", "{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}"

	ProjectSection(ProjectDependencies) = postProject

		{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
@@ -956,6 +964,37 @@ Global 
		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84528}.TLS_DEBUG.Build.0 = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic.ActiveCfg = classic|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic.Build.0 = classic|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic nt.ActiveCfg = classic|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.classic nt.Build.0 = classic|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Debug.ActiveCfg = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Debug.Build.0 = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Classic.ActiveCfg = classic|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Debug.ActiveCfg = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Pro.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_ProGPL.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Embedded_Release.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max nt.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Max nt.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.nt.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.nt.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl nt.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro gpl nt.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro nt.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.pro nt.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Release.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.Release.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS.ActiveCfg = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS.Build.0 = Release|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{3737BFE2-EF25-464F-994D-BD28A9F84529}.TLS_DEBUG.Build.0 = Debug|Win32

		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.ActiveCfg = Release|Win32

		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic.Build.0 = Release|Win32

		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}.classic nt.ActiveCfg = Release|Win32

netware/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ 
                                client/mysqlbinlog.def client/mysqlcheck.def \

                                client/mysqldump.def client/mysqlimport.def \

                                client/mysqlshow.def client/mysqltest.def \

                                client/mysqlslap.def \

                                extra/mysql_install.def extra/my_print_defaults.def \

                                extra/perror.def extra/replace.def \

                                extra/resolveip.def extra/comp_err.def \
@@ -56,7 +57,7 @@ EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ 
		mysql_test_run.def mysql_waitpid.def mysqladmin.def \

		mysqlbinlog.def mysqlcheck.def mysqld.def \

		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \

		mysqlshow.def mysqltest.def perror.def \

		mysqlshow.def mysqltest.def mysqlslap.def perror.def \

		replace.def resolve_stack_dump.def resolveip.def test_db.sql \

		static_init_db.sql \

		BUILD/apply-patch BUILD/compile-AUTOTOOLS \

netware/mysqlslap.def

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------

# MySQL Slap

#------------------------------------------------------------------------------

MODULE	libc.nlm

SCREENNAME "MySQL Slap[scrollable]"

COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."

DESCRIPTION "MySQL Slap Tool"

VERSION 4, 0

XDCDATA ../netware/mysql.xdc

#DEBUG

scripts/make_binary_distribution.sh

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  sql/mysqld$BS sql/mysql_tzinfo_to_sql$BS \

  server-tools/instance-manager/mysqlmanager$BS \

  client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \

  client/mysqlslap$BS \

  client/mysqldump$BS client/mysqlimport$BS \

  client/mysqltest$BS client/mysqlcheck$BS \

  client/mysqlbinlog$BS \
@@ -153,6 +154,7 @@ else 
    client/mysqltestmanagerc \

    client/mysqltestmanager-pwgen tools/mysqltestmanager \

    client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \

    client/.libs/mysqlslap \

    client/.libs/mysqldump client/.libs/mysqlimport \

    client/.libs/mysqltest client/.libs/mysqlcheck \

    client/.libs/mysqlbinlog client/.libs/mysqltestmanagerc \