Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot
include oqgraph into deb packages conditionally, just like we do with tokudb
  • Loading branch information
Sergei Golubchik committed Feb 9, 2015
1 parent c233d6e commit f007f82
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 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
Expand Down Expand Up @@ -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@
2 changes: 1 addition & 1 deletion 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
Expand Down Expand Up @@ -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@
1 change: 1 addition & 0 deletions storage/oqgraph/CMakeLists.txt
Expand Up @@ -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)

0 comments on commit f007f82

Please sign in to comment.