Commit 6d975ea2 authored by unknown's avatar unknown
Browse files

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
parents a5fda39d dddd8a65

VC++Files/mysql.sln

+41 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqld", "sql\mysqld.vcproj 
		{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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "storage\example\ 
	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 @@ Global 
		{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

VC++Files/plugin/fulltext/fulltext.def

0 → 100644
+5 −0
Original line number Diff line number Diff line 
LIBRARY	fulltext

EXPORTS

  _mysql_plugin_interface_version_

  _mysql_plugin_declarations_

 
 No newline at end of file

VC++Files/plugin/fulltext/fulltext.vcproj

0 → 100644
+125 −0
Original line number Diff line number Diff line 
<?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>

sql/ha_ndbcluster.cc

+5 −1
Original line number Diff line number Diff line
@@ -5813,7 +5813,11 @@ static bool ndbcluster_init() 
                        opt_ndbcluster_connectstring));

    goto ndbcluster_init_error;

  }



  {

    char buf[128];

    my_snprintf(buf, sizeof(buf), "mysqld --server-id=%d", server_id);

    g_ndb_cluster_connection->set_name(buf);

  }

  g_ndb_cluster_connection->set_optimized_node_selection

    (opt_ndb_optimized_node_selection);

storage/ndb/include/mgmapi/mgmapi.h

+8 −0
Original line number Diff line number Diff line
@@ -468,6 +468,14 @@ extern "C" { 
   */

  void ndb_mgm_destroy_handle(NdbMgmHandle * handle);



  /**

   * Set a name of the handle.  Name is reported in cluster log.

   *

   * @param   handle        Management handle

   * @param   name          Name

   */

  void ndb_mgm_set_name(NdbMgmHandle handle, const char *name);



  /** @} *********************************************************************/

  /**

   * @name Functions: Connect/Disconnect Management Server