MySQL Lists: commits: bk commit into 5.1 tree (SergeyV:1.2097) BUG#17202

List:	Commits	« Previous Message Next Message »
From:	sergeyv	Date:	February 9 2006 5:35pm
Subject:	bk commit into 5.1 tree (SergeyV:1.2097) BUG#17202
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2097 06/02/09 19:34:41 SergeyV@selena. +3 -0
  Fixes bug #17202. Added files to allow fulltext plugin example to be built on win32.

  VC++Files/plugin/fulltext/fulltext.vcproj
    1.1 06/02/09 19:34:28 SergeyV@selena. +125 -0
    fulltext.vcproj added to enable plugin example test under win32.

  VC++Files/plugin/fulltext/fulltext.vcproj
    1.0 06/02/09 19:34:28 SergeyV@selena. +0 -0
    BitKeeper file H:/MYSQL/src/#00001-mysql-5.1/VC++Files/plugin/fulltext/fulltext.vcproj

  VC++Files/plugin/fulltext/fulltext.def
    1.1 06/02/09 19:34:27 SergeyV@selena. +5 -0
    fulltext.def is added to allow exports for fulltext.dll

  VC++Files/plugin/fulltext/fulltext.def
    1.0 06/02/09 19:34:27 SergeyV@selena. +0 -0
    BitKeeper file H:/MYSQL/src/#00001-mysql-5.1/VC++Files/plugin/fulltext/fulltext.def

  VC++Files/mysql.sln
    1.14 06/02/09 19:34:26 SergeyV@selena. +41 -0
    mysql.sln updated to include fulltext plugin example.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#00001-mysql-5.1
--- New file ---
+++ VC++Files/plugin/fulltext/fulltext.def	06/02/09 19:34:27
LIBRARY	fulltext
EXPORTS
  _mysql_plugin_interface_version_
  _mysql_plugin_declarations_
 
--- New file ---
+++ VC++Files/plugin/fulltext/fulltext.vcproj	06/02/09 19:34:28
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="fulltext"
	ProjectGUID="{BFCDA391-91A5-45F5-A14F-1011F8424113}"
	Keyword="Win32Proj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="2"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../include"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FULLTEXT_EXPORTS"
				MinimalRebuild="TRUE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="1"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile="../../client_debug/fulltext.dll"
				LinkIncremental="2"
				ModuleDefinitionFile="fulltext.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile="$(OutDir)/fulltext.pdb"
				SubSystem="2"
				ImportLibrary="$(OutDir)/fulltext.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<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="2"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories="../../include"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FULLTEXT_EXPORTS"
				RuntimeLibrary="0"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="3"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile="../../client_release/fulltext.dll"
				LinkIncremental="1"
				ModuleDefinitionFile="fulltext.def"
				GenerateDebugInformation="TRUE"
				SubSystem="2"
				OptimizeReferences="2"
				EnableCOMDATFolding="2"
				ImportLibrary="$(OutDir)/fulltext.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<File
			RelativePath=".\fulltext.def">
		</File>
		<File
			RelativePath=".\plugin_example.c">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>


--- 1.13/VC++Files/mysql.sln	2006-01-30 15:09:01 +03:00
+++ 1.14/VC++Files/mysql.sln	2006-02-09 19:34:26 +03:00
@@ -124,6 +124,7 @@
 		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
 		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
 		{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
+		{BFCDA391-91A5-45F5-A14F-1011F8424113} = {BFCDA391-91A5-45F5-A14F-1011F8424113}
 		{433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6}
 		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
 		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
@@ -302,6 +303,10 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fulltext",
"plugin\fulltext\fulltext.vcproj", "{BFCDA391-91A5-45F5-A14F-1011F8424113}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		classic = classic
@@ -1778,6 +1783,42 @@
 		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS.Build.0 = TLS|Win32
 		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.ActiveCfg = TLS_DEBUG|Win32
 		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.Build.0 = TLS_DEBUG|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.classic.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.classic.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.classic nt.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.classic nt.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Debug.ActiveCfg = Debug|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Debug.Build.0 = Debug|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Classic.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Classic.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Debug.ActiveCfg = Debug|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Debug.Build.0 = Debug|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Pro.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Pro.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_ProGPL.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_ProGPL.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Release.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Embedded_Release.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Max.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Max.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Max nt.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Max nt.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.nt.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.nt.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro gpl.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro gpl.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro gpl nt.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro gpl nt.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro nt.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.pro nt.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Release.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.Release.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.TLS.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.TLS.Build.0 = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.TLS_DEBUG.ActiveCfg = Release|Win32
+		{BFCDA391-91A5-45F5-A14F-1011F8424113}.TLS_DEBUG.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
Thread
• bk commit into 5.1 tree (SergeyV:1.2097) BUG#17202	sergeyv	9 Feb