Skip to content

Commit f007f82

Browse files
author
Sergei Golubchik
committed
MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot
include oqgraph into deb packages conditionally, just like we do with tokudb
1 parent c233d6e commit f007f82

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

debian/dist/Debian/mariadb-server-5.5.files.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
usr/lib/mysql/plugin/ha_innodb.so
2-
usr/lib/mysql/plugin/ha_oqgraph.so
32
usr/lib/mysql/plugin/sphinx.so
43
usr/lib/mysql/plugin/auth_socket.so
54
usr/lib/mysql/plugin/auth_pam.so
@@ -73,3 +72,4 @@ usr/share/mysql/mysql_system_tables.sql
7372
usr/share/mysql/mysql_performance_tables.sql
7473
usr/share/mysql/mysql_test_data_timezone.sql
7574
@TOKUDB_DEB_FILES@
75+
@OQGRAPH_DEB_FILES@

debian/dist/Ubuntu/mariadb-server-5.5.files.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
usr/lib/mysql/plugin/ha_innodb.so
2-
usr/lib/mysql/plugin/ha_oqgraph.so
32
usr/lib/mysql/plugin/sphinx.so
43
usr/lib/mysql/plugin/auth_socket.so
54
usr/lib/mysql/plugin/auth_pam.so
@@ -75,3 +74,4 @@ usr/share/mysql/mysql_system_tables.sql
7574
usr/share/mysql/mysql_performance_tables.sql
7675
usr/share/mysql/mysql_test_data_timezone.sql
7776
@TOKUDB_DEB_FILES@
77+
@OQGRAPH_DEB_FILES@

storage/oqgraph/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,5 @@ IF(BOOST_OK)
5252

5353
MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE
5454
MODULE_ONLY)
55+
SET(OQGRAPH_DEB_FILES "usr/lib/mysql/plugin/ha_oqgraph.so\n" PARENT_SCOPE)
5556
ENDIF(BOOST_OK)

0 commit comments

Comments
 (0)