diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-16 09:49:34 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-16 09:50:26 +0200 |
commit | 49de95679da3040f6e653640476208d6fbf2c24e (patch) | |
tree | 6b7fe4937a1b988ec04d4762038ff62157ac4d12 | |
parent | 17d7cc731ebfeb110757fe182dc7329b7a145c68 (diff) | |
download | mariadb-git-49de95679da3040f6e653640476208d6fbf2c24e.tar.gz |
Revert "Make rocksdb build as a deb package too"
This reverts commit 38919f68a1eb1dca14a41885828499a9c0cb8157.
Temporary revert to be able to see other failures until builders are
updated.
-rw-r--r-- | debian/control | 9 | ||||
-rw-r--r-- | storage/rocksdb/CMakeLists.txt | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/debian/control b/debian/control index c501078f678..d0ecf4bddc3 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Build-Depends: bison, libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, libssl-dev, - libsnappy-dev, libsystemd-dev, libxml2-dev, lsb-release, @@ -453,14 +452,6 @@ Description: Connect storage engine for MariaDB other interesting features. This package contains the Connect plugin for MariaDB. -Package: mariadb-plugin-rocksdb -Architecture: any -Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends} -Description: RocksDB storage engine for MariaDB - The RocksDB storage engine is a high performance storage engine, aimed - at maximising storage efficiency while maintaining InnoDB-like performance. - This package contains the RocksDB plugin for MariaDB. - Package: mariadb-plugin-oqgraph Architecture: any Depends: libjudydebian1, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends} diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 2d8e67bd87d..ed1667dd6e1 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -74,9 +74,7 @@ SET(ROCKSDB_SE_SOURCES rdb_psi.cc ) -MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SE_SOURCES} STORAGE_ENGINE - MODULE_OUTPUT_NAME ha_rocksdb - COMPONENT rocksdb-engine) +MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SE_SOURCES} STORAGE_ENGINE MODULE_OUTPUT_NAME ha_rocksdb) IF(NOT TARGET rocksdb_se) # Bail out if compilation with rocksdb engine is not requested |