cleanup: galera merge, simple changes

Author: vuvova

.gitignore

@@ -106,6 +106,11 @@ scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/mytop
+scripts/wsrep_sst_common
+scripts/wsrep_sst_mysqldump
+scripts/wsrep_sst_rsync
+scripts/wsrep_sst_xtrabackup
+scripts/wsrep_sst_xtrabackup-v2
 sql-bench/bench-count-distinct
 sql-bench/bench-init.pl
 sql-bench/compare-results
@@ -200,6 +205,8 @@ support-files/mysql.server
 support-files/mysql.spec
 support-files/mysqld_multi.server
 support-files/ndb-config-2-node.ini
+support-files/wsrep.cnf
+support-files/wsrep_notify
 tags
 tests/async_queries
 tests/bug25714

CMakeLists.txt

@@ -376,9 +376,6 @@ ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(mysys_ssl)
 ADD_SUBDIRECTORY(libmysql)
-IF(WITH_WSREP)
-  ADD_SUBDIRECTORY(wsrep)
-ENDIF()
 ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(libservices)
@@ -395,6 +392,10 @@ IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(libmysqld/examples)
   ENDIF(WITH_EMBEDDED_SERVER)
 
+  IF(WITH_WSREP)
+    ADD_SUBDIRECTORY(wsrep)
+  ENDIF()
+
   ADD_SUBDIRECTORY(mysql-test)
   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
   ADD_SUBDIRECTORY(sql-bench)

client/client_priv.h

@@ -92,7 +92,6 @@ enum options_client
   OPT_REPORT_PROGRESS,
   OPT_SKIP_ANNOTATE_ROWS_EVENTS,
   OPT_SSL_CRL, OPT_SSL_CRLPATH,
-  OPT_GALERA_SST_MODE,
   OPT_MAX_CLIENT_OPTION /* should be always the last */
 };
 

client/mysqldump.c

@@ -347,7 +347,7 @@ static struct my_option my_long_options[] =
   {"force", 'f', "Continue even if we get an SQL error.",
    &ignore_errors, &ignore_errors, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
-  {"galera-sst-mode", OPT_GALERA_SST_MODE,
+  {"galera-sst-mode", 0,
    "This mode should normally be used in mysqldump snapshot state transfer "
    "(SST) in a Galera cluster. If enabled, mysqldump additionally dumps "
    "commands to turn off binary logging and SET global gtid_binlog_state "

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)

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})
 

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()
 
-#

config.h.cmake

@@ -642,6 +642,12 @@
 #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
 #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@
 
+#ifndef EMBEDDED_LIBRARY
+#cmakedefine WSREP_INTERFACE_VERSION "@WSREP_INTERFACE_VERSION@"
+#cmakedefine WITH_WSREP 1
+#cmakedefine WSREP_PROC_INFO 1
+#endif
+
 #ifdef _AIX
 /*
   AIX includes inttypes.h from sys/types.h

debian/dist/Debian/control

@@ -192,7 +192,11 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}), galera (>=25.2), rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
+Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl,
+         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd,
+         lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}),
+         galera (>=25.2), rsync, lsof, socat | netcat, grep, gawk, iproute,
+         coreutils, findutils
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,

debian/dist/Ubuntu/control

@@ -186,7 +186,11 @@ Architecture: any
 Suggests: tinyca, mailx, mariadb-test
 Recommends: libhtml-template-perl
 Pre-Depends: mariadb-common, adduser (>= 3.40), debconf
-Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}), galera (>=25.2), rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils
+Depends: mariadb-client-10.1 (>= ${source:Version}), libdbi-perl,
+         perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd,
+         lsb-base (>= 3.0-10), mariadb-server-core-10.1 (>= ${binary:Version}),
+         galera (>=25.2), rsync, lsof, socat | netcat, grep, gawk, iproute,
+         coreutils, findutils
 Provides: mariadb-server, mysql-server, virtual-mysql-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,