Revert "In case WITH_WSREP is enabled, build wsrep as plugin"

This reverts commit e45f7f48.

cmake/plugin.cmake

@@ -30,7 +30,7 @@ INCLUDE(CMakeParseArguments)
 
 MACRO(MYSQL_ADD_PLUGIN)
   CMAKE_PARSE_ARGUMENTS(ARG
-    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;CLIENT;EXPORT_SYMBOLS"
+    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;CLIENT"
     "MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG"
     "LINK_LIBRARIES;DEPENDS"
     ${ARGN}
@@ -139,9 +139,7 @@ MACRO(MYSQL_ADD_PLUGIN)
     ADD_LIBRARY(${target} STATIC ${SOURCES})
     DTRACE_INSTRUMENT(${target})
     ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDS})
-    IF(NOT ARG_EXPORT_SYMBOLS)
-      RESTRICT_SYMBOL_EXPORTS(${target})
-    ENDIF()
+    RESTRICT_SYMBOL_EXPORTS(${target})
     IF(WITH_EMBEDDED_SERVER)
       # Embedded library should contain PIC code and be linkable
       # to shared libraries (on systems that need PIC)

sql/CMakeLists.txt

@@ -36,10 +36,9 @@ IF(WITH_WSREP AND NOT EMBEDDED_LIBRARY)
     wsrep_plugin.cc
     service_wsrep.cc
   )
-  MYSQL_ADD_PLUGIN(wsrep ${WSREP_SOURCES} MANDATORY EXPORT_SYMBOLS LINK_LIBRARIES wsrep-lib wsrep_api_v26)
+  SET(WSREP_LIB wsrep-lib wsrep_api_v26)
 ELSE()
-  ADD_LIBRARY(wsrep STATIC wsrep_dummy.cc)
-  ADD_DEPENDENCIES(wsrep GenError)
+  SET(WSREP_SOURCES wsrep_dummy.cc)
 ENDIF()
 
 INCLUDE_DIRECTORIES(
@@ -143,6 +142,7 @@ SET (SQL_SOURCE
                opt_split.cc
                rowid_filter.cc rowid_filter.h
                opt_trace.cc
+	       ${WSREP_SOURCES}
                table_cache.cc encryption.cc temporary_tables.cc
                proxy_protocol.cc backup.cc xa.cc
                ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
@@ -180,10 +180,11 @@ DTRACE_INSTRUMENT(sql)
 TARGET_LINK_LIBRARIES(sql
   mysys mysys_ssl dbug strings vio pcre
   ${LIBWRAP} ${LIBCRYPT} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
+  ${WSREP_LIB}
   ${SSL_LIBRARIES}
   ${LIBSYSTEMD})
 
-FOREACH(se aria partition perfschema sql_sequence wsrep)
+FOREACH(se aria partition perfschema sql_sequence)
   # These engines are used directly in sql sources.
   IF(TARGET ${se})
     TARGET_LINK_LIBRARIES(sql ${se})

sql/sql_builtin.cc.in

@@ -32,6 +32,9 @@ extern
 builtin_maria_plugin 
   @mysql_mandatory_plugins@ @mysql_optional_plugins@
   builtin_maria_binlog_plugin,
+#ifdef WITH_WSREP
+  builtin_maria_wsrep_plugin,
+#endif /* WITH_WSREP */
  builtin_maria_mysql_password_plugin;
 
 struct st_maria_plugin *mysql_optional_plugins[]=
@@ -42,5 +45,8 @@ struct st_maria_plugin *mysql_optional_plugins[]=
 struct st_maria_plugin *mysql_mandatory_plugins[]=
 {
   builtin_maria_binlog_plugin, builtin_maria_mysql_password_plugin,
+#ifdef WITH_WSREP
+  builtin_maria_wsrep_plugin,
+#endif /* WITH_WSREP */
   @mysql_mandatory_plugins@ 0
 };