Fixes according to Svoj's review #2

CMakeLists.txt

@@ -383,10 +383,6 @@ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
 # Add storage engines and plugins.
 CONFIGURE_PLUGINS()
 
-IF(WITH_WSREP)
-  ADD_SUBDIRECTORY(wsrep-lib)
-ENDIF()
-
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(dbug)
 ADD_SUBDIRECTORY(strings)
@@ -408,6 +404,10 @@ IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(unittest/embedded)
   ENDIF(WITH_EMBEDDED_SERVER)
 
+  IF(WITH_WSREP)
+    ADD_SUBDIRECTORY(wsrep-lib)
+  ENDIF()
+
   ADD_SUBDIRECTORY(mysql-test)
   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
   ADD_SUBDIRECTORY(sql-bench)
@@ -427,7 +427,7 @@ INCLUDE(cmake/tags.cmake)
 
 
 
-#INCLUDE(for_clients)
+INCLUDE(for_clients)
 ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(support-files)
 

cmake/wsrep.cmake

@@ -32,7 +32,7 @@ OPTION(WITH_WSREP_ALL
 SET(WSREP_PATCH_VERSION "22")
 
 # Obtain wsrep API version
-FILE(STRINGS "${MySQL_SOURCE_DIR}/wsrep/wsrep_api.h" WSREP_API_VERSION
+FILE(STRINGS "${CMAKE_SOURCE_DIR}/wsrep-lib/wsrep-API/v26/wsrep_api.h" WSREP_API_VERSION
      LIMIT_COUNT 1 REGEX "WSREP_INTERFACE_VERSION")
 STRING(REGEX MATCH "([0-9]+)" WSREP_API_VERSION "${WSREP_API_VERSION}")
 

extra/mariabackup/CMakeLists.txt

@@ -40,9 +40,6 @@ IF(NOT HAVE_SYSTEM_REGEX)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/pcre)
 ENDIF()
 
-IF(WITH_WSREP)
-  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib)
-ENDIF()
 
 ADD_DEFINITIONS(-UMYSQL_SERVER)
 ########################################################################

mysql-test/include/mtr_warnings.sql

@@ -229,53 +229,6 @@ INSERT INTO global_suppressions VALUES
    MDEV-12501 -- set --maturity-level by default
  */
  ("Plugin .* is of maturity level .* while the server is .*"),
- ("WSREP:*down context*"),
- ("WSREP: Failed to send state UUID:*"),
- ("WSREP: wsrep_sst_receive_address is set to '127.0.0.1"),
- ("WSREP: option --wsrep-causal-reads is deprecated"),
- ("WSREP: --wsrep-causal-reads=ON takes precedence over --wsrep-sync-wait=0"),
- ("WSREP: Could not open saved state file for reading: "),
- ("WSREP: Could not open state file for reading: "),
- ("WSREP: access file\\(.*gvwstate\\.dat\\) failed\\(No such file or directory\\)"),
- ("WSREP: Gap in state sequence\\. Need state transfer\\."),
- ("WSREP: Failed to prepare for incremental state transfer: Local state UUID \\(00000000-0000-0000-0000-000000000000\\) does not match group state UUID"),
- ("WSREP: No existing UUID has been found, so we assume that this is the first time that this server has been started\\. Generating a new UUID: "),
- ("WSREP: last inactive check more than"),
- ("WSREP: binlog cache not empty \\(0 bytes\\) at connection close"),
- ("WSREP: SQL statement was ineffective"),
- ("WSREP: Refusing exit for the last slave thread"),
- ("WSREP: Quorum: No node with complete state"),
- ("WSREP: Failed to report last committed"),
- ("Slave SQL: Error 'Duplicate entry"),
- ("Query apply warning:"),
- ("WSREP: Ignoring error"),
- ("WSREP: Initial position was provided by configuration or SST, avoiding override"),
- ("Warning: Using a password on the command line interface can be insecure"),
- ("InnoDB: Error: Table \"mysql\"\\.\"innodb_table_stats\" not found"),
- ("but it is impossible to select State Transfer donor: Resource temporarily unavailable"),
- ("WSREP: Could not find peer"),
- ("WSREP: discarding established \\(time wait\\)"),
- ("sending install message failed: Resource temporarily unavailable"),
- ("WSREP: Ignoring possible split-brain \\(allowed by configuration\\) from view"),
- ("WSREP: no nodes coming from prim view, prim not possible"),
- ("WSREP: Failed to prepare for incremental state transfer: Local state seqno is undefined:"),
- ("WSREP: gcs_caused\\(\\) returned -107 \\(Transport endpoint is not connected\\)"),
- ("WSREP: gcs_caused\\(\\) returned -57 \\(Socket is not connected\\)"),
- ("WSREP: gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)"),
- ("Action message in non-primary configuration from member"),
- ("SYNC message from member"),
- ("InnoDB: Resizing redo log from"),
- ("InnoDB: Starting to delete and rewrite log files"),
- ("InnoDB: New log files created, LSN="),
--- WSREP: Send action {0x7f86280147f0, 73, STATE_REQUEST} returned -107 (Transport endpoint is not connected)
- ("Transport endpoint is not connected"),
- ("Socket is not connected"),
--- "WSREP: Protocol violation. JOIN message sender 1.0 (host-91-221-67-96) is not in state transfer (SYNCED). Message ignored.
- ("is not in state transfer"),
- ("JOIN message from member .* in non-primary configuration"),
- ("install timer expired"),
- ("Last Applied Action message in non-primary configuration from member"),
-
  ("THE_LAST_SUPPRESSION")||