diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | debian/control | 15 | ||||
| -rw-r--r-- | debian/mariadb-plugin-cassandra.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-10.2.install (renamed from debian/mariadb-server-10.2.install.in) | 4 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/spider/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 1 |
8 files changed, 25 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 54b3cbee939..b19b796621f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -435,12 +435,6 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) -IF(DEB) - CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.install.in - ${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.2.install) -ENDIF(DEB) - # Handle the "INFO_*" files. INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake) # Source: This can be done during the cmake phase, all information is diff --git a/debian/control b/debian/control index d7b24c6ce80..37f5b07f341 100644 --- a/debian/control +++ b/debian/control @@ -489,6 +489,21 @@ Description: Mroonga storage engine for MariaDB provides fast CJK-ready full text searching using column store. This package contains the Mroonga plugin for MariaDB. +Package: mariadb-plugin-cassandra +Architecture: any +Depends: mariadb-server-10.2, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version}) +Replaces: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version}) +Description: Cassandra storage engine for MariaDB + The Cassandra Storage Engine allows access to data in a Cassandra cluster from + MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage + engine) makes Cassandra's column family appear as a table in MariaDB that you + can insert to, update, and select from. You can write joins against this table, + it is possible to join data that's stored in MariaDB with data that's stored in + Cassandra. + Package: mariadb-plugin-spider Architecture: any Depends: mariadb-server-10.2|mariadb-galera-server-10.2, diff --git a/debian/mariadb-plugin-cassandra.install b/debian/mariadb-plugin-cassandra.install new file mode 100644 index 00000000000..ca195058a17 --- /dev/null +++ b/debian/mariadb-plugin-cassandra.install @@ -0,0 +1,2 @@ +etc/mysql/conf.d/cassandra.cnf etc/mysql/mariadb.conf.d +usr/lib/mysql/plugin/ha_cassandra.so diff --git a/debian/mariadb-server-10.2.install.in b/debian/mariadb-server-10.2.install index 8caa4c3b001..e0b12402c1f 100644 --- a/debian/mariadb-server-10.2.install.in +++ b/debian/mariadb-server-10.2.install @@ -104,7 +104,3 @@ usr/share/mysql/mysql_system_tables.sql usr/share/mysql/mysql_performance_tables.sql usr/share/mysql/mysql_test_data_timezone.sql usr/share/mysql/wsrep_notify -@CASSANDRA_DEB_FILES@ -@SPIDER_DEB_FILES@ -@TOKUDB_DEB_FILES@ -@SYSTEMD_DEB_FILES@ diff --git a/debian/rules b/debian/rules index 6919fcc14b4..0ef9138541b 100755 --- a/debian/rules +++ b/debian/rules @@ -121,6 +121,14 @@ override_dh_auto_install: # If Mroonga plugin was not built skip the package [ -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || sed -i -e "/Package: mariadb-plugin-mroonga/,+11d" debian/control + # If libthrift-dev was available (manually installed, as it is + # not in Debian) and ha_cassandra.so was thus built, create package, + # otherwise skip it. + [ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+14d" debian/control + + # If Spider plugin was not built skip the package + [ -f $(BUILDDIR)/storage/spider/ha_spider.so ] || sed -i -e "/Package: mariadb-plugin-spider/,+12d" debian/control + # make install cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index df097c90a47..a5d58234d97 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -50,7 +50,6 @@ SET(cassandra_sources LINK_DIRECTORIES(${LINK_DIR}) IF(CASSANDRASE_OK) - SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE) MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) ENDIF(CASSANDRASE_OK) diff --git a/storage/spider/CMakeLists.txt b/storage/spider/CMakeLists.txt index 402c74b2cde..14c50f35bd9 100644 --- a/storage/spider/CMakeLists.txt +++ b/storage/spider/CMakeLists.txt @@ -41,7 +41,6 @@ ELSE() ${CMAKE_SOURCE_DIR}/storage/spider/scripts/install_spider.sql DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) - SET(SPIDER_DEB_FILES "usr/lib/mysql/plugin/ha_spider.so usr/share/mysql/install_spider.sql" PARENT_SCOPE) MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider") ENDIF() diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 765e6733a98..fd3bf90f8c4 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -35,7 +35,6 @@ ENDIF() MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) ############################################ -SET(TOKUDB_DEB_FILES "usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump" PARENT_SCOPE) MARK_AS_ADVANCED(BUILDNAME) MARK_AS_ADVANCED(BUILD_TESTING) MARK_AS_ADVANCED(CMAKE_TOKUDB_REVISION) |