From: Tor Didriksen
Date: August 31 2012 2:21pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:4402 to 4403)
List-Archive: http://lists.mysql.com/commits/144674
Message-Id: <20120831142134.28533.8729.4403@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4403 Tor Didriksen	2012-08-31 [merge]
      merge 5.6 => trunk

    modified:
      cmake/create_initial_db.cmake.in
      mysys_ssl/CMakeLists.txt
 4402 Marc Alff	2012-08-31 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2012-07-31 06:34:10 +0000
+++ b/cmake/create_initial_db.cmake.in	2012-08-31 14:03:47 +0000
@@ -18,7 +18,13 @@ SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@
 SET(CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@")
 SET(MYSQLD_EXECUTABLE "@MYSQLD_EXECUTABLE@")
 SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
+
+SET(WITH_SSL_PATH "@WITH_SSL_PATH@")
+SET(CRYPTO_LIBRARY "@CRYPTO_LIBRARY@")
+SET(OPENSSL_LIBRARY "@OPENSSL_LIBRARIES@")
+
 SET(WIN32 "@WIN32@")
+
 # Force Visual Studio to output to stdout
 IF(ENV{VS_UNICODE_OUTPUT})
  SET ($ENV{VS_UNICODE_OUTPUT})
@@ -67,6 +73,17 @@ SET(BOOTSTRAP_COMMAND 
 )
 
 GET_FILENAME_COMPONENT(CWD . ABSOLUTE)
+
+IF(WITH_SSL_PATH)
+  GET_FILENAME_COMPONENT(MYSQLD_DIR "${MYSQLD_EXECUTABLE}" PATH)
+  GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
+  GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARY}" NAME_WE)
+  CONFIGURE_FILE("${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll"
+                 "${MYSQLD_DIR}/${CRYPTO_NAME}.dll" COPYONLY)
+  CONFIGURE_FILE("${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll"
+                 "${MYSQLD_DIR}/${OPENSSL_NAME}.dll" COPYONLY)
+ENDIF()
+
 EXECUTE_PROCESS(
   COMMAND "@CMAKE_COMMAND@" -E echo Executing ${BOOTSTRAP_COMMAND}
 )

=== modified file 'mysys_ssl/CMakeLists.txt'
--- a/mysys_ssl/CMakeLists.txt	2012-08-07 05:14:58 +0000
+++ b/mysys_ssl/CMakeLists.txt	2012-08-31 14:03:47 +0000
@@ -24,7 +24,7 @@ ENDIF()
 # We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
 # In order to get correct symbol visibility, these files
 # must be compiled with "-fvisibility=hidden"
-IF(HAVE_VISIBILITY_HIDDEN)
+IF(WITH_SSL STREQUAL "bundled" AND HAVE_VISIBILITY_HIDDEN)
   SET_SOURCE_FILES_PROPERTIES(
     crypt_genhash_impl.cc
     my_aes.cc

No bundle (reason: useless for push emails).