MDEV-7161: Build failure in buildbot on work-amd64-valgrind

Fix for embedded build failure. Also added wsrep_info plugin library to server debian package.
MariaDB · Nov 23, 2014 · deffb95 · deffb95
1 parent 369c026
commit deffb95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/debian/dist/Debian/mariadb-server-10.1.files.in b/debian/dist/Debian/mariadb-server-10.1.files.in
@@ -12,6 +12,7 @@ usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/server_audit.so
+usr/lib/mysql/plugin/wsrep_status.so
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf

diff --git a/debian/dist/Ubuntu/mariadb-server-10.1.files.in b/debian/dist/Ubuntu/mariadb-server-10.1.files.in
@@ -12,6 +12,7 @@ usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/mysql/plugin/server_audit.so
+usr/lib/mysql/plugin/wsrep_status.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
 usr/share/apport/package-hooks/source_mariadb-10.1.py

diff --git a/plugin/wsrep_info/CMakeLists.txt b/plugin/wsrep_info/CMakeLists.txt
@@ -1,5 +1,5 @@
 IF (WITH_WSREP)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
                       ${CMAKE_SOURCE_DIR}/wsrep)
-  MYSQL_ADD_PLUGIN(WSREP_STATUS plugin.cc)
+  MYSQL_ADD_PLUGIN(WSREP_STATUS plugin.cc MODULE_ONLY)
 ENDIF()