Commit e7c2a13b authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg
Browse files

auto-merge

parents 743149bc 674d57be

.bzr-mysql/default.conf

+1 −1
Original line number Diff line number Diff line 
[MYSQL]

post_commit_to = "commits@lists.mysql.com"

post_push_to = "commits@lists.mysql.com"

tree_name = "mysql-5.0"
 
tree_name = "mysql-5.1-bugteam"

CMakeLists.txt

+6 −8
Original line number Diff line number Diff line
@@ -82,18 +82,18 @@ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") 
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")

SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

# Disable warnings in Visual Studio 8 and above

IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

   CMAKE_GENERATOR MATCHES "Visual Studio 8")

ENDIF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")



# Settings for Visual Studio 7 and above.  

IF(MSVC)

    # replace /MDd with /MTd

    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})

    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
@@ -123,9 +123,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
    IF(NOT tmp_manifest)

        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")

    ENDIF(NOT tmp_manifest)



ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

      CMAKE_GENERATOR MATCHES "Visual Studio 8")

ENDIF(MSVC)



ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")

extra/yassl/taocrypt/taocrypt.vcproj

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

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="taocrypt"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			Name="Win32"/>

	</Platforms>

	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\debug_obj"

			IntermediateDirectory=".\debug_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,mySTL"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

				ExceptionHandling="FALSE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\debug_obj/taocrypt.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				BrowseInformation="1"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="4"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\debug_obj\taocrypt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="_DEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,mySTL"

				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

				StringPooling="TRUE"

				ExceptionHandling="FALSE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\release_obj/taocrypt.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\release_obj\taocrypt.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<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="src\aes.cpp">

			</File>

			<File

				RelativePath="src\aestables.cpp">

			</File>

			<File

				RelativePath="src\algebra.cpp">

			</File>

			<File

				RelativePath="src\arc4.cpp">

			</File>

			<File

				RelativePath="src\asn.cpp">

			</File>

			<File

				RelativePath="src\coding.cpp">

			</File>

			<File

				RelativePath="src\des.cpp">

			</File>

			<File

				RelativePath="src\dh.cpp">

			</File>

			<File

				RelativePath="src\dsa.cpp">

			</File>

			<File

				RelativePath="src\file.cpp">

			</File>

			<File

				RelativePath="src\hash.cpp">

			</File>

			<File

				RelativePath="src\integer.cpp">

			</File>

			<File

				RelativePath="src\md2.cpp">

			</File>

			<File

				RelativePath="src\md4.cpp">

			</File>

			<File

				RelativePath="src\md5.cpp">

			</File>

			<File

				RelativePath="src\misc.cpp">

			</File>

			<File

				RelativePath="src\random.cpp">

			</File>

			<File

				RelativePath="src\ripemd.cpp">

			</File>

			<File

				RelativePath="src\rsa.cpp">

			</File>

			<File

				RelativePath="src\sha.cpp">

			</File>

		</Filter>

		<Filter

			Name="Header Files"

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

			<File

				RelativePath="include\aes.hpp">

			</File>

			<File

				RelativePath="include\algebra.hpp">

			</File>

			<File

				RelativePath="include\arc4.hpp">

			</File>

			<File

				RelativePath="include\asn.hpp">

			</File>

			<File

				RelativePath="include\block.hpp">

			</File>

			<File

				RelativePath="include\coding.hpp">

			</File>

			<File

				RelativePath="include\des.hpp">

			</File>

			<File

				RelativePath="include\dh.hpp">

			</File>

			<File

				RelativePath="include\dsa.hpp">

			</File>

			<File

				RelativePath="include\error.hpp">

			</File>

			<File

				RelativePath="include\file.hpp">

			</File>

			<File

				RelativePath="include\hash.hpp">

			</File>

			<File

				RelativePath="include\hmac.hpp">

			</File>

			<File

				RelativePath="include\integer.hpp">

			</File>

			<File

				RelativePath="include\md2.hpp">

			</File>

			<File

				RelativePath="include\md4.hpp">

			</File>

			<File

				RelativePath="include\md5.hpp">

			</File>

			<File

				RelativePath="include\misc.hpp">

			</File>

			<File

				RelativePath="include\modarith.hpp">

			</File>

			<File

				RelativePath="include\modes.hpp">

			</File>

			<File

				RelativePath="include\random.hpp">

			</File>

			<File

				RelativePath="include\ripemd.hpp">

			</File>

			<File

				RelativePath="include\rsa.hpp">

			</File>

			<File

				RelativePath="include\sha.hpp">

			</File>

		</Filter>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>

extra/yassl/yassl.vcproj

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

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="yassl"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			Name="Win32"/>

	</Platforms>

	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\debug_obj"

			IntermediateDirectory=".\debug_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL"

				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;YASSL_PREFIX"

				ExceptionHandling="FALSE"

				BasicRuntimeChecks="3"

				RuntimeLibrary="1"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\debug_obj/yassl.pch"

				AssemblerListingLocation=".\debug_obj/"

				ObjectFile=".\debug_obj/"

				ProgramDataBaseFileName=".\debug_obj/"

				BrowseInformation="1"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="4"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\debug_obj\yassl.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="_DEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release_obj"

			IntermediateDirectory=".\release_obj"

			ConfigurationType="4"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="include,taocrypt\include,taocrypt\mySTL"

				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;YASSL_PREFIX"

				StringPooling="TRUE"

				ExceptionHandling="FALSE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				UsePrecompiledHeader="2"

				PrecompiledHeaderFile=".\release_obj/yassl.pch"

				AssemblerListingLocation=".\release_obj/"

				ObjectFile=".\release_obj/"

				ProgramDataBaseFileName=".\release_obj/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\release_obj\yassl.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<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="src\buffer.cpp">

			</File>

			<File

				RelativePath="src\cert_wrapper.cpp">

			</File>

			<File

				RelativePath="src\crypto_wrapper.cpp">

			</File>

			<File

				RelativePath="src\handshake.cpp">

			</File>

			<File

				RelativePath="src\lock.cpp">

			</File>

			<File

				RelativePath="src\log.cpp">

			</File>

			<File

				RelativePath="src\socket_wrapper.cpp">

			</File>

			<File

				RelativePath="src\ssl.cpp">

			</File>

			<File

				RelativePath="src\timer.cpp">

			</File>

			<File

				RelativePath="src\yassl_error.cpp">

			</File>

			<File

				RelativePath="src\yassl_imp.cpp">

			</File>

			<File

				RelativePath="src\yassl_int.cpp">

			</File>

		</Filter>

		<Filter

			Name="Header Files"

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

			<File

				RelativePath="include\buffer.hpp">

			</File>

			<File

				RelativePath="include\cert_wrapper.hpp">

			</File>

			<File

				RelativePath="include\crypto_wrapper.hpp">

			</File>

			<File

				RelativePath="include\factory.hpp">

			</File>

			<File

				RelativePath="include\handshake.hpp">

			</File>

			<File

				RelativePath="include\lock.hpp">

			</File>

			<File

				RelativePath="include\log.hpp">

			</File>

			<File

				RelativePath="include\socket_wrapper.hpp">

			</File>

			<File

				RelativePath="include\timer.hpp">

			</File>

			<File

				RelativePath="include\yassl_error.hpp">

			</File>

			<File

				RelativePath="include\yassl_imp.hpp">

			</File>

			<File

				RelativePath="include\yassl_int.hpp">

			</File>

			<File

				RelativePath="include\yassl_types.hpp">

			</File>

		</Filter>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>

libmysql/dll.c

+12 −1
Original line number Diff line number Diff line
@@ -89,9 +89,20 @@ BOOL APIENTRY LibMain(HANDLE hInst,DWORD ul_reason_being_called, 
  UNREFERENCED_PARAMETER(lpReserved);

} /* LibMain */





static BOOL do_libmain;

int __stdcall DllMain(HANDLE hInst,DWORD ul_reason_being_called,LPVOID lpReserved)

{

  /*

    Unless environment variable LIBMYSQL_DLLINIT is set, do nothing.

    The environment variable is checked once, during the first call to DllMain()

    (in DLL_PROCESS_ATTACH hook).

  */

  if (ul_reason_being_called == DLL_PROCESS_ATTACH)

    do_libmain = (getenv("LIBMYSQL_DLLINIT") != NULL);

  if (do_libmain)

    return LibMain(hInst,ul_reason_being_called,lpReserved);

  return TRUE;

}



#elif defined(WINDOWS)