cleanup: galera merge, simple changes

3 files changed, 24 insertions, 51 deletions

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index d8f659ec5ea..738f0a2ecd1 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -149,8 +149,13 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
 
 SETA(CPACK_RPM_server_PACKAGE_REQUIRES
   "${CPACK_RPM_PACKAGE_REQUIRES}"
-  "MariaDB-client" "galera" "rsync" "lsof" "socat" "grep" "gawk" "iproute"
+  "MariaDB-client")
+
+IF(WITH_WSREP)
+SETA(CPACK_RPM_server_PACKAGE_REQUIRES
+  "galera" "rsync" "lsof" "socat" "grep" "gawk" "iproute"
   "coreutils" "findutils")
+ENDIF()
 
 SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
 SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index ad309c51066..632c4cfe442 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -155,14 +155,6 @@ MACRO(MYSQL_ADD_PLUGIN)
       ENDIF()
     ENDIF()
 
-    IF (WITH_WSREP)
-      # Set compile definitions for non-embedded plugins
-      LIST(APPEND wsrep_definitions "WITH_WSREP")
-      LIST(APPEND wsrep_definitions "WSREP_PROC_INFO")
-      SET_TARGET_PROPERTIES(${target} PROPERTIES
-        COMPILE_DEFINITIONS "${wsrep_definitions}")
-    ENDIF()
-    
     IF(ARG_STATIC_OUTPUT_NAME)
       SET_TARGET_PROPERTIES(${target} PROPERTIES 
       OUTPUT_NAME ${ARG_STATIC_OUTPUT_NAME})
@@ -195,15 +187,8 @@ MACRO(MYSQL_ADD_PLUGIN)
     ADD_LIBRARY(${target} MODULE ${SOURCES}) 
     DTRACE_INSTRUMENT(${target})
 
-    LIST(APPEND dyn_compile_definitions "MYSQL_DYNAMIC_PLUGIN")
-
-    IF (WITH_WSREP)
-      LIST(APPEND dyn_compile_definitions "WITH_WSREP")
-      LIST(APPEND dyn_compile_definitions "WSREP_PROC_INFO")
-    ENDIF()
-
     SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
-      COMPILE_DEFINITIONS "${dyn_compile_definitions}")
+      COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
 
     TARGET_LINK_LIBRARIES (${target} mysqlservices ${ARG_LINK_LIBRARIES})
 
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index d3c8da6a72a..211ed30ff4c 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -14,6 +14,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
+#
+# Galera library does not compile with windows
+#
+IF(UNIX)
+  SET(with_wsrep_default ON)
+ELSE()
+  SET(with_wsrep_default OFF)
+ENDIF()
+
+OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ${with_wsrep_default})
+
 # Set the patch version
 SET(WSREP_PATCH_VERSION "10")
 
@@ -32,42 +43,14 @@ IF (DEFINED ENV{WSREP_REV})
   SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
 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_INTERFACE_VERSION 25)
 
-IF(NOT WSREP_PATCH_REVNO)
-  MESSAGE(WARNING "Could not determine bzr revision number, WSREP_VERSION will "
-          "not contain the revision number.")
-  SET(WSREP_VERSION
-      "${WSREP_API_VERSION}.${WSREP_PATCH_VERSION}"
-  )
-ELSE()
-  SET(WSREP_VERSION
-      "${WSREP_API_VERSION}.${WSREP_PATCH_VERSION}.r${WSREP_PATCH_REVNO}"
-  )
-ENDIF()
+SET(WSREP_VERSION
+    "${WSREP_INTERFACE_VERSION}.${WSREP_PATCH_VERSION}.r${WSREP_PATCH_REVNO}")
 
-#
-# Galera library does not compile with windows and solaris
-#
-IF(UNIX)
-OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ON)
-ELSE()
-OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" OFF)
-ENDIF()
+SET(WSREP_PROC_INFO ${WITH_WSREP})
 
-MACRO (BUILD_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}")
+IF(WITH_WSREP)
   SET(COMPILATION_COMMENT "${COMPILATION_COMMENT}, wsrep_${WSREP_VERSION}")
-  #SET(WITH_EMBEDDED_SERVER OFF CACHE INTERNAL "" FORCE)
-ENDMACRO()
+ENDIF()
 
-#