[Commits] Rev 4429: MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot in lp:~maria-captains/maria/5.5

Sergei Golubchik serg at mariadb.org
Tue Feb 10 16:07:53 EET 2015


At lp:~maria-captains/maria/5.5

------------------------------------------------------------
revno: 4429
revision-id: sergii at pisem.net-20150209195328-2i18dpx3v0upb588
parent: holyfoot at askmonty.org-20150210121631-byrqdvs0ctrrnsf6
fixes bug: https://mariadb.atlassian.net/browse/MDEV-7351
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.5
timestamp: Mon 2015-02-09 20:53:28 +0100
message:
  MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot
  
  include oqgraph into deb packages conditionally, just like we do with tokudb
=== modified file 'debian/dist/Debian/mariadb-server-5.5.files.in'
--- a/debian/dist/Debian/mariadb-server-5.5.files.in	2014-02-27 20:41:08 +0000
+++ b/debian/dist/Debian/mariadb-server-5.5.files.in	2015-02-09 19:53:28 +0000
@@ -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@
+ at OQGRAPH_DEB_FILES@

=== modified file 'debian/dist/Ubuntu/mariadb-server-5.5.files.in'
--- a/debian/dist/Ubuntu/mariadb-server-5.5.files.in	2014-02-27 20:41:08 +0000
+++ b/debian/dist/Ubuntu/mariadb-server-5.5.files.in	2015-02-09 19:53:28 +0000
@@ -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@
+ at OQGRAPH_DEB_FILES@

=== modified file 'storage/oqgraph/CMakeLists.txt'
--- a/storage/oqgraph/CMakeLists.txt	2014-01-26 20:49:39 +0000
+++ b/storage/oqgraph/CMakeLists.txt	2015-02-09 19:53:28 +0000
@@ -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)



More information about the commits mailing list