diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-11-23 09:55:57 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-11-23 09:55:57 -0500 |
| commit | deffb95bc2849b016e309a1d5803d13d3ceff05a (patch) | |
| tree | 5de0de3b83c5f320f848e6f8e5a79e1f2af450af | |
| parent | 369c02674cb024ceb1995433913ef2fb32f815ca (diff) | |
| download | mariadb-git-deffb95bc2849b016e309a1d5803d13d3ceff05a.tar.gz | |
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.
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.1.files.in | 1 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.1.files.in | 1 | ||||
| -rw-r--r-- | plugin/wsrep_info/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/debian/dist/Debian/mariadb-server-10.1.files.in b/debian/dist/Debian/mariadb-server-10.1.files.in index 40a3a051169..402bbade712 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 2aaab83498d..36ab7d9e330 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 4d7c3ed706e..b70981d2f7b 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() |