diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-02-09 20:53:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-02-09 20:53:28 +0100 |
| commit | f007f82881b4294fa00236780309522863259546 (patch) | |
| tree | c47ad334216a69b642f325cc0950cd998e53073f | |
| parent | c233d6e120e20ea39dc7b9eac4cef264befc3cd0 (diff) | |
| download | mariadb-git-f007f82881b4294fa00236780309522863259546.tar.gz | |
MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot
include oqgraph into deb packages conditionally, just like we do with tokudb
| -rw-r--r-- | debian/dist/Debian/mariadb-server-5.5.files.in | 2 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-5.5.files.in | 2 | ||||
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/dist/Debian/mariadb-server-5.5.files.in b/debian/dist/Debian/mariadb-server-5.5.files.in index 5682adbdce0..c1ea58740e4 100644 --- a/debian/dist/Debian/mariadb-server-5.5.files.in +++ b/debian/dist/Debian/mariadb-server-5.5.files.in @@ -1,5 +1,4 @@ usr/lib/mysql/plugin/ha_innodb.so -usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/sphinx.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/auth_pam.so @@ -73,3 +72,4 @@ usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql @TOKUDB_DEB_FILES@ +@OQGRAPH_DEB_FILES@ diff --git a/debian/dist/Ubuntu/mariadb-server-5.5.files.in b/debian/dist/Ubuntu/mariadb-server-5.5.files.in index 06a6643d650..7f75ccc2303 100644 --- a/debian/dist/Ubuntu/mariadb-server-5.5.files.in +++ b/debian/dist/Ubuntu/mariadb-server-5.5.files.in @@ -1,5 +1,4 @@ usr/lib/mysql/plugin/ha_innodb.so -usr/lib/mysql/plugin/ha_oqgraph.so usr/lib/mysql/plugin/sphinx.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/auth_pam.so @@ -75,3 +74,4 @@ usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql @TOKUDB_DEB_FILES@ +@OQGRAPH_DEB_FILES@ diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 7b110b7de5a..0a3cabcd03c 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -52,4 +52,5 @@ IF(BOOST_OK) MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE MODULE_ONLY) + SET(OQGRAPH_DEB_FILES "usr/lib/mysql/plugin/ha_oqgraph.so\n" PARENT_SCOPE) ENDIF(BOOST_OK) |