Commit 85752275 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Merge ramayana.hindu.god:/home/tsmith/m/bk/50 

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
parents d0dc51b4 f376ea1b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
*.bin

*.vcproj.cmake

cmake_install.cmake

*.cdf

*.core

*.d

*.da

CMakeLists.txt

+32 −6
Original line number Diff line number Diff line
@@ -139,21 +139,47 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")



IF(EMBED_MANIFESTS)

    # Search for the Manifest tool.  CMake will first search it's defaults

    # (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and

    # the system PATH) followed by the listed paths which are the current

    # possible defaults and should be updated when necessary.  The custom

    # manifests are designed to be compatible with all mt versions.

    # Search for the tools (mt, makecat, signtool) necessary for embedding

    # manifests and signing executables with the MySQL AB authenticode cert.

    #

    # CMake will first search it's defaults (CMAKE_FRAMEWORK_PATH, 

    # CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and the system PATH) followed 

    # by the listed paths which are the current possible defaults and should be

    # updated when necessary.  

    # 

    # The custom manifests are designed to be compatible with all mt versions.

    # The MySQL AB Authenticode certificate is available only internally.  

    # Others should store a single signing certificate in a local cryptographic

    # service provider and alter the signtool command as necessary.

    FIND_PROGRAM(HAVE_MANIFEST_TOOL NAMES mt

                 PATHS

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/VC/bin"

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")

    FIND_PROGRAM(HAVE_CATALOG_TOOL NAMES makecat

                 PATHS

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin")

    FIND_PROGRAM(HAVE_SIGN_TOOL NAMES signtool

                 PATHS

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/Common7/Tools/Bin"

                 "$ENV{PROGRAMFILES}/Microsoft Visual Studio 8/SDK/v2.0/Bin")



    IF(HAVE_MANIFEST_TOOL)

        MESSAGE(STATUS "Found Mainfest Tool. Embedding custom manifests.")

        MESSAGE(STATUS "Found Mainfest Tool.")

    ELSE(HAVE_MANIFEST_TOOL)

        MESSAGE(FATAL_ERROR "Manifest tool, mt.exe, can't be found.")

    ENDIF(HAVE_MANIFEST_TOOL)

    IF(HAVE_CATALOG_TOOL)

        MESSAGE(STATUS "Found Catalog Tool.")

    ELSE(HAVE_CATALOG_TOOL)

        MESSAGE(FATAL_ERROR "Catalog tool, makecat.exe, can't be found.")

    ENDIF(HAVE_CATALOG_TOOL)

    IF(HAVE_SIGN_TOOL)

        MESSAGE(STATUS "Found Sign Tool. Embedding custom manifests and signing executables.")

    ELSE(HAVE_SIGN_TOOL)

        MESSAGE(FATAL_ERROR "Sign tool, signtool.exe, can't be found.")

    ENDIF(HAVE_SIGN_TOOL)



    # Disable automatic manifest generation.

    STRING(REPLACE "/MANIFEST" "/MANIFEST:NO" CMAKE_EXE_LINKER_FLAGS 

    	   ${CMAKE_EXE_LINKER_FLAGS})

config/ac-macros/large_file.m4

+3 −8
Original line number Diff line number Diff line
@@ -127,14 +127,9 @@ AC_DEFUN([MYSQL_SYS_LARGEFILE], 
	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)

	  ac_cv_sys_largefile_source=1 ;;

	esac])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,

       ac_cv_sys_large_files,

       [Large files support on AIX-style hosts.],

       [case "$host_os" in

	# AIX 4.2 and later

	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)

	  ac_cv_sys_large_files=1 ;;

	esac])



     # AIX 4.2 and later -- do nothing, include standards.h instead.

     # this goes for both GNU and IBM C and C++ compilers.

   fi

  ])

configure.in

+6 −0
Original line number Diff line number Diff line
@@ -2898,6 +2898,12 @@ then 
  ndb_opt_subdirs="$ndb_opt_subdirs docs"

  ndb_bin_am_ldflags=""

fi

# building dynamic breaks on AIX. (If you want to try it and get unresolved

# __vec__delete2 and some such, try linking against libhC.)

case "$host_os" in

  aix3.* | aix4.0.* | aix4.1.*) ;;

  *) ndb_bin_am_ldflags="-static";;

esac

AC_SUBST([ndb_bin_am_ldflags])

AC_SUBST([ndb_opt_subdirs])

extra/yassl/taocrypt/src/coding.cpp

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ void Base64Decoder::Decode() 
{

    word32 bytes = coded_.size();

    word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz); 

    plainSz = (plainSz * 3 + 3) / 4;

    plainSz = ((plainSz * 3) / 4) + 3;

    decoded_.New(plainSz);



    word32 i = 0;