From 85bef794f7d7b61e9fc11f3d94e003c99a599b86 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 16 Aug 2019 11:35:06 +0200 Subject: [PATCH] MDEV-19780 Remove the TokuDB storage engine disable tokudb, because it's being deprecated by the vendor --- debian/autobake-deb.sh | 2 ++ storage/tokudb/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index d2bf2aaabd1..8b70e784615 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -106,6 +106,8 @@ then sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control fi +sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control + # Mroonga, TokuDB never built on Travis CI anyway, see build flags above if [[ $TRAVIS ]] then diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 3b4e4fb967e..c4f50e967cb 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -38,6 +38,7 @@ SET(TOKUDB_SOURCES tokudb_thread.cc tokudb_dir_cmd.cc) MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY + DISABLED COMPONENT tokudb-engine CONFIG ${CMAKE_CURRENT_BINARY_DIR}/tokudb.cnf) IF(NOT TARGET tokudb)