Merge 10.0 to galera-10.0

11 files changed, 404 insertions, 56 deletions

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index fec266d8f3b..c285d1bbb51 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -173,12 +173,12 @@ IF(UNIX)
 
   # Default GCC flags
   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(COMMON_C_FLAGS               "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_C_FLAGS               "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing  -Wno-uninitialized")
     SET(CMAKE_C_FLAGS_DEBUG          "-O ${COMMON_C_FLAGS}")
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
   ENDIF()
   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(COMMON_CXX_FLAGS               "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(COMMON_CXX_FLAGS               "-g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
     SET(CMAKE_CXX_FLAGS_DEBUG          "-O ${COMMON_CXX_FLAGS}")
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
diff --git a/cmake/configure.pl b/cmake/configure.pl
index 9f46a5668c9..9e4aafdc05e 100644
--- a/cmake/configure.pl
+++ b/cmake/configure.pl
@@ -150,6 +150,16 @@ foreach my $option (@ARGV)
     $cmakeargs = $cmakeargs." -DWITH_ZLIB=system";
     next;
   }
+  if($option =~ /with-libevent=/)
+  {
+    $cmakeargs = $cmakeargs." -DWITH_LIBEVENT=system";
+    next;
+  }
+  if($option =~ /with-libevent/)
+  {
+    $cmakeargs = $cmakeargs." -DWITH_LIBEVENT=bundled";
+    next;
+  }
   if($option =~ /with-ssl=/)
   {
     $cmakeargs = $cmakeargs." -DWITH_SSL=yes";
@@ -247,6 +257,16 @@ foreach my $option (@ARGV)
       print("configure.pl : ignoring $option\n");
       next;
   }
+  if ($option =~ /with-client-ldflags/)
+  {
+      print("configure.pl : ignoring $option\n");
+      next;
+  }
+  if ($option =~ /with-mysqld-ldflags=/)
+  {
+      print("configure.pl : ignoring $option\n");
+      next;
+  }
 
   $option = uc($option);
   $option =~ s/-/_/g;
diff --git a/cmake/cpu_info.cmake b/cmake/cpu_info.cmake
new file mode 100644
index 00000000000..32b98142ace
--- /dev/null
+++ b/cmake/cpu_info.cmake
@@ -0,0 +1,30 @@
+# Copyright (c) 2009, 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+# Symbols with information about the CPU.
+
+FIND_PROGRAM(GETCONF getconf)
+MARK_AS_ADVANCED(GETCONF)
+
+IF(GETCONF)
+  EXECUTE_PROCESS(
+    COMMAND ${GETCONF} LEVEL1_DCACHE_LINESIZE
+    OUTPUT_VARIABLE CPU_LEVEL1_DCACHE_LINESIZE
+    )
+ENDIF()
+IF(CPU_LEVEL1_DCACHE_LINESIZE AND CPU_LEVEL1_DCACHE_LINESIZE GREATER 0)
+ELSE()
+  SET(CPU_LEVEL1_DCACHE_LINESIZE 64)
+ENDIF()
diff --git a/cmake/libevent.cmake b/cmake/libevent.cmake
new file mode 100644
index 00000000000..54498e1bb15
--- /dev/null
+++ b/cmake/libevent.cmake
@@ -0,0 +1,89 @@
+# Copyright (C) 2011 Oracle and/or its affiliates. All Rights Reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
+  SET(LIBEVENT_LIBRARY  event)
+  SET(LIBEVENT_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/libevent)
+  SET(LIBEVENT_FOUND  TRUE)
+  SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent")
+  ADD_SUBDIRECTORY(libevent)
+  GET_TARGET_PROPERTY(src libevent SOURCES)
+  FOREACH(file ${src})
+    SET(LIBEVENT_SOURCES ${LIBEVENT_SOURCES} ${CMAKE_SOURCE_DIR}/libevent/${file})
+  ENDFOREACH()
+ENDMACRO()
+
+# MYSQL_CHECK_LIBEVENT
+#
+# Provides the following configure options:
+# WITH_LIBEVENT_BUNDLED
+# If this is set,we use bindled libevent
+# If this is not set,search for system libevent. 
+# if system libevent is not found, use bundled copy
+# LIBEVENT_LIBRARIES, LIBEVENT_INCLUDE_DIR and LIBEVENT_SOURCES
+# are set after this macro has run
+
+MACRO (MYSQL_CHECK_LIBEVENT)
+
+    IF (NOT WITH_LIBEVENT)
+      SET(WITH_LIBEVENT "bundled"  CACHE STRING "By default use bundled libevent on this platform")
+    ENDIF()
+  
+  IF(WITH_LIBEVENT STREQUAL "bundled")
+    MYSQL_USE_BUNDLED_LIBEVENT()
+  ELSEIF(WITH_LIBEVENT STREQUAL "system" OR WITH_LIBEVENT STREQUAL "yes")
+    SET(LIBEVENT_FIND_QUIETLY TRUE)
+
+    IF (NOT LIBEVENT_INCLUDE_PATH)
+      set(LIBEVENT_INCLUDE_PATH /usr/local/include /opt/local/include)
+    ENDIF()
+
+    find_path(LIBEVENT_INCLUDE_DIR event.h PATHS ${LIBEVENT_INCLUDE_PATH})
+
+    if (NOT LIBEVENT_INCLUDE_DIR)
+        MESSAGE(SEND_ERROR "Cannot find appropriate event.h in /usr/local/include or /opt/local/include. Use bundled libevent")
+    endif() 
+
+    IF (NOT LIBEVENT_LIB_PATHS) 
+      set(LIBEVENT_LIB_PATHS /usr/local/lib /opt/local/lib)
+    ENDIF()
+
+    find_library(LIBEVENT_LIB event PATHS ${LIBEVENT_LIB_PATHS})
+
+    if (NOT LIBEVENT_LIB)
+        MESSAGE(SEND_ERROR "Cannot find appropriate event lib in /usr/local/lib or /opt/local/lib. Use bundled libevent")
+    endif() 
+
+    IF (LIBEVENT_LIB AND LIBEVENT_INCLUDE_DIR)
+      set(LIBEVENT_FOUND TRUE)
+      set(LIBEVENT_LIBS ${LIBEVENT_LIB})
+    ELSE()
+      set(LIBEVENT_FOUND FALSE)
+    ENDIF()
+
+    IF(LIBEVENT_FOUND)
+      SET(LIBEVENT_SOURCES "")
+      SET(LIBEVENT_LIBRARIES ${LIBEVENT_LIBS})
+      SET(LIBEVENT_INCLUDE_DIRS ${LIBEVENT_INCLUDE_DIR})
+      SET(LIBEVENT_DEFINES "-DHAVE_LIBEVENT")
+    ELSE()
+      IF(WITH_LIBEVENT STREQUAL "system")
+        MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for libevent. Use bundled libevent")
+      ENDIF()
+      MYSQL_USE_BUNDLED_LIBEVENT()
+    ENDIF()
+
+  ENDIF()
+ENDMACRO()
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
index 7c13df05ca4..2da701d39b0 100644
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -304,20 +304,22 @@ FUNCTION(GET_DEPENDEND_OS_LIBS target result)
   SET(${result} ${ret} PARENT_SCOPE)
 ENDFUNCTION()
 
-MACRO(RESTRICT_SYMBOL_EXPORTS target)
-  SET(VISIBILITY_HIDDEN_FLAG)
+SET(VISIBILITY_HIDDEN_FLAG)
 
-  IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX)
-    CHECK_C_COMPILER_FLAG("-fvisibility=hidden" HAVE_VISIBILITY_HIDDEN)
-    IF(HAVE_VISIBILITY_HIDDEN)
-      SET(VISIBILITY_HIDDEN_FLAG "-fvisibility=hidden")
-    ENDIF()
+IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX)
+  CHECK_C_COMPILER_FLAG("-fvisibility=hidden" HAVE_VISIBILITY_HIDDEN)
+  IF(HAVE_VISIBILITY_HIDDEN)
+    SET(VISIBILITY_HIDDEN_FLAG "-fvisibility=hidden")
   ENDIF()
+ENDIF()
 
-  IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
-    SET(VISIBILITY_HIDDEN_FLAG "-xldscope=hidden")
-  ENDIF()
+IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
+  SET(VISIBILITY_HIDDEN_FLAG "-xldscope=hidden")
+ENDIF()
 
+# We try to hide the symbols in yassl/zlib to avoid name clashes with
+# other libraries like openssl.
+FUNCTION(RESTRICT_SYMBOL_EXPORTS target)
   IF(VISIBILITY_HIDDEN_FLAG)
     GET_TARGET_PROPERTY(COMPILE_FLAGS ${target} COMPILE_FLAGS)
     IF(NOT COMPILE_FLAGS)
@@ -327,5 +329,4 @@ MACRO(RESTRICT_SYMBOL_EXPORTS target)
     SET_TARGET_PROPERTIES(${target} PROPERTIES 
       COMPILE_FLAGS "${COMPILE_FLAGS} ${VISIBILITY_HIDDEN_FLAG}")
   ENDIF()
-
-ENDMACRO()
+ENDFUNCTION()
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 42ddb12bf37..254d9f6d946 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -80,10 +80,6 @@ IF(MSVC)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
   ENDFOREACH()
   
-  # Remove support for exceptions
-  FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_INIT)
-   STRING(REPLACE "/EHsc" ""   "${flag}" "${${flag}}") 
-  ENDFOREACH()
  
   # Fix CMake's predefined huge stack size
   FOREACH(type EXE SHARED MODULE)
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 83ea3b0f3b3..2a6fb5ae31f 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -368,4 +368,6 @@ SET(HAVE_EVENT_H CACHE INTERNAL "")
 SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
 SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
+SET(HAVE_UCONTEXT_H CACHE INTERNAL "")
+SET(HAVE_SOCKPEERCRED CACHE INTERNAL "")
 ENDIF()
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index b4125e873d6..87db39d68d4 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,19 +83,22 @@ IF(NOT VERSION)
         MATH(EXPR VER  "${VER} -4")
         SET(DEFAULT_PLATFORM "osx10.${VER}")
       ENDIF()
-      LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
-      IF(LEN GREATER 1)
-        SET(DEFAULT_MACHINE "universal")
+
+      IF(CMAKE_OSX_ARCHITECTURES)
+        LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
+        IF(LEN GREATER 1)
+          SET(DEFAULT_MACHINE "universal")
+        ELSE()
+          SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        ENDIF()
       ELSE()
-        SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
-        IF(NOT DEFAULT_MACHINE)
-          IF(CMAKE_SIZEOF_VOIPD EQUAL 4)
-            SET(DEFAULT_MACHINE  "i386")
-          ELSE()
-            SET(DEFAULT_MACHINE  "x86_64")
-          ENDIF()
+        IF(64BIT)
+          SET(DEFAULT_MACHINE "x86_64")
+        ELSE()
+          SET(DEFAULT_MACHINE "i386")
         ENDIF()
       ENDIF()
+
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
       ENDIF()
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 2f1ebc8f428..cc8788b22bc 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -90,7 +90,8 @@ MACRO(MYSQL_ADD_PLUGIN)
     AND NOT ARG_MODULE_ONLY)
      
     SET(WITH_${plugin} 1)
-  ELSEIF(WITHOUT_${plugin}_STORAGE_ENGINE OR WITH_NONE OR ${plugin}_DISABLED)
+  ELSEIF(WITHOUT_${plugin} OR WITHOUT_${plugin}_STORAGE_ENGINE OR
+         WITH_NONE OR ${plugin}_DISABLED)
     SET(WITHOUT_${plugin} 1)
     SET(WITH_${plugin}_STORAGE_ENGINE 0)
     SET(WITH_${plugin} 0)
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index ca950229129..55a60708ed7 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -13,80 +13,227 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
+# We support different versions of SSL:
+# - "bundled" uses source code in <source dir>/extra/yassl
+# - "system"  (typically) uses headers/libraries in /usr/lib and /usr/lib64
+# - a custom installation of openssl can be used like this
+#     - cmake -DCMAKE_PREFIX_PATH=</path/to/custom/openssl> -DWITH_SSL="system"
+#   or
+#     - cmake -DWITH_SSL=</path/to/custom/openssl>
+#
+# The default value for WITH_SSL is "bundled"
+# set in cmake/build_configurations/feature_set.cmake
+#
+# For custom build/install of openssl, see the accompanying README and
+# INSTALL* files. When building with gcc, you must build the shared libraries
+# (in addition to the static ones):
+#   ./config --prefix=</path/to/custom/openssl> --shared; make; make install
+# On some platforms (mac) you need to choose 32/64 bit architecture.
+# Build/Install of openssl on windows is slightly different: you need to run
+# perl and nmake. You might also need to
+#   'set path=</path/to/custom/openssl>\bin;%PATH%
+# in order to find the .dll files at runtime.
+
+SET(WITH_SSL_DOC "bundled (use yassl)")
+SET(WITH_SSL_DOC
+  "${WITH_SSL_DOC}, yes (prefer os library if present, otherwise use bundled)")
+SET(WITH_SSL_DOC
+  "${WITH_SSL_DOC}, system (use os library)")
+SET(WITH_SSL_DOC
+  "${WITH_SSL_DOC}, </path/to/custom/installation>")
+
 MACRO (CHANGE_SSL_SETTINGS string)
-  SET(WITH_SSL ${string} CACHE STRING "Options are: no bundled yes(prefer os library if present otherwise use bundled) system(use os library)" FORCE)
+  SET(WITH_SSL ${string} CACHE STRING ${WITH_SSL_DOC} FORCE)
 ENDMACRO()
 
 MACRO (MYSQL_USE_BUNDLED_SSL)
   SET(INC_DIRS 
-  ${CMAKE_SOURCE_DIR}/extra/yassl/include
-  ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
+    ${CMAKE_SOURCE_DIR}/extra/yassl/include
+    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
   )
   SET(SSL_LIBRARIES  yassl taocrypt)
   SET(SSL_INCLUDE_DIRS ${INC_DIRS})
   SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
-  SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PURE_C -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED")
+  SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED")
   CHANGE_SSL_SETTINGS("bundled")
-  #Remove -fno-implicit-templates 
-  #(yassl sources cannot  be compiled with  it)
-  SET(SAVE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  IF(CMAKE_CXX_FLAGS)
-  STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS 
-    ${CMAKE_CXX_FLAGS})
-  ENDIF()
   ADD_SUBDIRECTORY(extra/yassl)
   ADD_SUBDIRECTORY(extra/yassl/taocrypt)
-  SET(CMAKE_CXX_FLAGS ${SAVE_CXX_FLAGS})
   GET_TARGET_PROPERTY(src yassl SOURCES)
   FOREACH(file ${src})
     SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/${file})
   ENDFOREACH()
   GET_TARGET_PROPERTY(src taocrypt SOURCES)
   FOREACH(file ${src})
-    SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/${file})
+    SET(SSL_SOURCES ${SSL_SOURCES}
+      ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/${file})
   ENDFOREACH()
 ENDMACRO()
 
 # MYSQL_CHECK_SSL
 #
 # Provides the following configure options:
-# WITH_SSL=[yes|no|bundled]
+# WITH_SSL=[yes|bundled|system|<path/to/custom/installation>]
 MACRO (MYSQL_CHECK_SSL)
   IF(NOT WITH_SSL)
    IF(WIN32)
      CHANGE_SSL_SETTINGS("bundled")
    ELSE()
-     CHANGE_SSL_SETTINGS("no")
+     SET(WITH_SSL "yes")
    ENDIF()
   ENDIF()
 
+  # See if WITH_SSL is of the form </path/to/custom/installation>
+  FILE(GLOB WITH_SSL_HEADER ${WITH_SSL}/include/openssl/ssl.h)
+  IF (WITH_SSL_HEADER)
+    SET(WITH_SSL_PATH ${WITH_SSL} CACHE PATH "path to custom SSL installation")
+  ENDIF()
+
   IF(WITH_SSL STREQUAL "bundled")
     MYSQL_USE_BUNDLED_SSL()
-  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes")
-    # Check for system library
-    SET(OPENSSL_FIND_QUIETLY TRUE)
-    INCLUDE(FindOpenSSL)
-    FIND_LIBRARY(CRYPTO_LIBRARY crypto)
-    MARK_AS_ADVANCED(CRYPTO_LIBRARY)
+    # Reset some variables, in case we switch from /path/to/ssl to "bundled".
+    IF (WITH_SSL_PATH)
+      UNSET(WITH_SSL_PATH)
+      UNSET(WITH_SSL_PATH CACHE)
+    ENDIF()
+    IF (OPENSSL_ROOT_DIR)
+      UNSET(OPENSSL_ROOT_DIR)
+      UNSET(OPENSSL_ROOT_DIR CACHE)
+    ENDIF()
+    IF (OPENSSL_INCLUDE_DIR)
+      UNSET(OPENSSL_INCLUDE_DIR)
+      UNSET(OPENSSL_INCLUDE_DIR CACHE)
+    ENDIF()
+    IF (WIN32 AND OPENSSL_APPLINK_C)
+      UNSET(OPENSSL_APPLINK_C)
+      UNSET(OPENSSL_APPLINK_C CACHE)
+    ENDIF()
+    IF (OPENSSL_LIBRARIES)
+      UNSET(OPENSSL_LIBRARIES)
+      UNSET(OPENSSL_LIBRARIES CACHE)
+    ENDIF()
+  ELSEIF(WITH_SSL STREQUAL "system" OR
+         WITH_SSL STREQUAL "yes" OR
+         WITH_SSL_PATH
+         )
+    # First search in WITH_SSL_PATH.
+    FIND_PATH(OPENSSL_ROOT_DIR
+      NAMES include/openssl/ssl.h
+      NO_CMAKE_PATH
+      NO_CMAKE_ENVIRONMENT_PATH
+      HINTS ${WITH_SSL_PATH}
+    )
+    # Then search in standard places (if not found above).
+    FIND_PATH(OPENSSL_ROOT_DIR
+      NAMES include/openssl/ssl.h
+    )
+
+    FIND_PATH(OPENSSL_INCLUDE_DIR
+      NAMES openssl/ssl.h
+      HINTS ${OPENSSL_ROOT_DIR}/include
+    )
+
+    IF (WIN32)
+      FIND_FILE(OPENSSL_APPLINK_C
+        NAMES openssl/applink.c
+        HINTS ${OPENSSL_ROOT_DIR}/include
+      )
+      MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
+    ENDIF()
+
+    # On mac this list is <.dylib;.so;.a>
+    # We prefer static libraries, so we revert it here.
+    IF (WITH_SSL_PATH)
+      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+    ENDIF()
+    MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+    FIND_LIBRARY(OPENSSL_LIBRARIES
+                 NAMES ssl ssleay32 ssleay32MD
+                 HINTS ${OPENSSL_ROOT_DIR}/lib)
+    FIND_LIBRARY(CRYPTO_LIBRARY
+                 NAMES crypto libeay32
+                 HINTS ${OPENSSL_ROOT_DIR}/lib)
+    IF (WITH_SSL_PATH)
+      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+    ENDIF()
+
+    # Verify version number. Version information looks like:
+    #   #define OPENSSL_VERSION_NUMBER 0x1000103fL
+    # Encoded as MNNFFPPS: major minor fix patch status
+    FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+      OPENSSL_VERSION_NUMBER
+      REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+    )
+    STRING(REGEX REPLACE
+      "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+      OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+    )
+
+    IF(OPENSSL_INCLUDE_DIR AND
+       OPENSSL_LIBRARIES   AND
+       CRYPTO_LIBRARY
+      )
+      SET(OPENSSL_FOUND TRUE)
+    ELSE()
+      SET(OPENSSL_FOUND FALSE)
+    ENDIF()
+
+    MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
+    MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+    MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}")
+    MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}")
+
     INCLUDE(CheckSymbolExists)
     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
     CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" 
                         HAVE_SHA512_DIGEST_LENGTH)
-    SET(CMAKE_REQUIRED_INCLUDES)
-    IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH)
+    IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH)
       SET(SSL_SOURCES "")
       SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY})
+      IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+        SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET})
+      ENDIF()
+      IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL})
+      ENDIF()
+      MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}")
       SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
       SET(SSL_INTERNAL_INCLUDE_DIRS "")
       SET(SSL_DEFINES "-DHAVE_OPENSSL")
-      CHANGE_SSL_SETTINGS("system")
     ELSE()
       IF(WITH_SSL STREQUAL "system")
         MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use  WITH_SSL=bundled to enable SSL support")
       ENDIF()
       MYSQL_USE_BUNDLED_SSL()
     ENDIF()
-  ELSEIF(NOT WITH_SSL STREQUAL "no")
-    MESSAGE(SEND_ERROR "Wrong option for WITH_SSL. Valid values are : yes, no, bundled")
+  ELSE()
+    MESSAGE(SEND_ERROR
+      "Wrong option for WITH_SSL. Valid values are : "${WITH_SSL_DOC})
+  ENDIF()
+ENDMACRO()
+
+
+# Many executables will depend on libeay32.dll and ssleay32.dll at runtime.
+# In order to ensure we find the right version(s), we copy them into
+# the same directory as the executables.
+# NOTE: Using dlls will likely crash in malloc/free,
+#       see INSTALL.W32 which comes with the openssl sources.
+# So we should be linking static versions of the libraries.
+MACRO (COPY_OPENSSL_DLLS target_name)
+  IF (WIN32 AND WITH_SSL_PATH)
+    GET_FILENAME_COMPONENT(CRYPTO_NAME "${CRYPTO_LIBRARY}" NAME_WE)
+    GET_FILENAME_COMPONENT(OPENSSL_NAME "${OPENSSL_LIBRARIES}" NAME_WE)
+    FILE(GLOB HAVE_CRYPTO_DLL "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll")
+    FILE(GLOB HAVE_OPENSSL_DLL "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll")
+    IF (HAVE_CRYPTO_DLL AND HAVE_OPENSSL_DLL)
+      ADD_CUSTOM_COMMAND(OUTPUT ${target_name}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+          "${WITH_SSL_PATH}/bin/${CRYPTO_NAME}.dll"
+          "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_NAME}.dll"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+          "${WITH_SSL_PATH}/bin/${OPENSSL_NAME}.dll"
+          "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_NAME}.dll"
+        )
+      ADD_CUSTOM_TARGET(${target_name} ALL)
+    ENDIF()
   ENDIF()
 ENDMACRO()
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
new file mode 100644
index 00000000000..608b33b31a1
--- /dev/null
+++ b/cmake/wsrep.cmake
@@ -0,0 +1,59 @@
+# Copyright (c) 2011, Codership Oy <info@codership.com>.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+# We need to generate a proper spec file even without --with-wsrep flag,
+# so WSREP_VERSION is produced regardless
+
+# Set the patch version
+SET(WSREP_PATCH_VERSION "7.5")
+
+# Obtain patch revision number
+SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
+IF(NOT WSREP_PATCH_REVNO)
+  EXECUTE_PROCESS(
+    COMMAND bzr revno
+    OUTPUT_VARIABLE WSREP_PATCH_REVNO
+    RESULT_VARIABLE RESULT
+  )
+STRING(REGEX REPLACE "(\r?\n)+$" "" WSREP_PATCH_REVNO "${WSREP_PATCH_REVNO}")
+#FILE(WRITE "wsrep_config" "Debug: WSREP_PATCH_REVNO result: ${RESULT}\n")
+ENDIF()
+IF(NOT WSREP_PATCH_REVNO)
+  SET(WSREP_PATCH_REVNO "XXXX")
+ENDIF()
+
+# Obtain wsrep API version
+EXECUTE_PROCESS(
+  COMMAND sh -c "grep WSREP_INTERFACE_VERSION ${MySQL_SOURCE_DIR}/wsrep/wsrep_api.h | cut -d '\"' -f 2"
+  OUTPUT_VARIABLE WSREP_API_VERSION
+  RESULT_VARIABLE RESULT
+)
+#FILE(WRITE "wsrep_config" "Debug: WSREP_API_VERSION result: ${RESULT}\n")
+STRING(REGEX REPLACE "(\r?\n)+$" "" WSREP_API_VERSION "${WSREP_API_VERSION}")
+
+SET(WSREP_VERSION
+    "${WSREP_API_VERSION}.${WSREP_PATCH_VERSION}.r${WSREP_PATCH_REVNO}"
+)
+
+OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ON)
+IF (WITH_WSREP)
+  SET(WSREP_C_FLAGS   "-DWITH_WSREP -DWSREP_PROC_INFO -DMYSQL_MAX_VARIABLE_VALUE_LEN=2048")
+  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${WSREP_C_FLAGS}")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WSREP_C_FLAGS}")
+  SET(COMPILATION_COMMENT "${COMPILATION_COMMENT}, wsrep_${WSREP_VERSION}")
+  SET(WITH_EMBEDDED_SERVER OFF CACHE INTERNAL "" FORCE)
+ENDIF()
+
+#