[Commits] deffb95: MDEV-7161: Build failure in buildbot on work-amd64-valgrind

nirbhay at mariadb.com nirbhay at mariadb.com
Sun Nov 23 16:56:02 EET 2014


revision-id: deffb95bc2849b016e309a1d5803d13d3ceff05a
parent(s): 369c02674cb024ceb1995433913ef2fb32f815ca
committer: Nirbhay Choubey
branch nick: server
timestamp: 2014-11-23 09:55:57 -0500
message:

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.

---
 debian/dist/Debian/mariadb-server-10.1.files.in | 1 +
 debian/dist/Ubuntu/mariadb-server-10.1.files.in | 1 +
 plugin/wsrep_info/CMakeLists.txt                | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/dist/Debian/mariadb-server-10.1.files.in b/debian/dist/Debian/mariadb-server-10.1.files.in
index 40a3a05..402bbad 100644
--- 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
index 2aaab834..36ab7d9 100644
--- 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
index 4d7c3ed..b70981d 100644
--- 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()


More information about the commits mailing list