Commit 9cc1c74c authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Vicențiu-Marian Ciorbaru

MDEV-21944: Remove TokuDB from Debian packaging

It was already disabled in 1589cf1c but
turns out that as long as the packaging is there, is requires maintenance,
ensuring it still builds, debugging failing tests etc and that takes its
toll and is not worth all the extra work. Having it "only disabled" does
not help, since either we have it and keep it tested and working, or we
don't have it and don't spend time on keeping it working and tested.

In MDEV-19780 there was already a decision to drop TokuDB from MariaDB.

If somebody wants TokuDB, they can use the 10.4 branch.
parent 86f59e86
...@@ -86,9 +86,6 @@ then ...@@ -86,9 +86,6 @@ then
sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control
fi fi
# Don't include TokuDB package as it is not built anymore by default (MDEV-19780)
sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control
# If libpcre2-dev is not available (before Debian Stretch and Ubuntu Xenial) # If libpcre2-dev is not available (before Debian Stretch and Ubuntu Xenial)
# attempt to build using older libpcre3-dev (SIC!) # attempt to build using older libpcre3-dev (SIC!)
if ! apt-cache madison libpcre2-dev | grep --quiet 'libpcre2-dev' if ! apt-cache madison libpcre2-dev | grep --quiet 'libpcre2-dev'
......
...@@ -528,10 +528,6 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -528,10 +528,6 @@ Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5, mariadb-server-5.5,
mariadb-tokudb-engine-10.0,
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-10.2,
mariadb-tokudb-engine-5.5,
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
mysql-client-5.6 (<< ${source:Version}), mysql-client-5.6 (<< ${source:Version}),
mysql-client-5.7 (<< ${source:Version}), mysql-client-5.7 (<< ${source:Version}),
...@@ -558,10 +554,6 @@ Replaces: libmariadbclient-dev (<< 5.5.0), ...@@ -558,10 +554,6 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5, mariadb-server-5.5,
mariadb-tokudb-engine-10.0,
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-10.2,
mariadb-tokudb-engine-5.5,
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}),
mysql-client-5.6 (<< ${source:Version}), mysql-client-5.6 (<< ${source:Version}),
mysql-client-5.7 (<< ${source:Version}), mysql-client-5.7 (<< ${source:Version}),
...@@ -685,28 +677,6 @@ Description: OQGraph storage engine for MariaDB ...@@ -685,28 +677,6 @@ Description: OQGraph storage engine for MariaDB
(trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL. (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.
This package contains the OQGraph plugin for MariaDB. This package contains the OQGraph plugin for MariaDB.
Package: mariadb-plugin-tokudb
Architecture: amd64
Depends: libjemalloc1 (>= 3.0.0~) | libjemalloc2,
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
mariadb-server-10.3,
mariadb-server-10.4
Replaces: mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
mariadb-server-10.3,
mariadb-server-10.4
Description: TokuDB storage engine for MariaDB
The TokuDB storage engine is for use in high-performance and write-intensive
environments, offering increased compression and better performance based
on fractal indexes.
This package contains the TokuDB plugin for MariaDB.
Package: mariadb-plugin-mroonga Package: mariadb-plugin-mroonga
Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
Depends: mariadb-server-10.5 (= ${binary:Version}), Depends: mariadb-server-10.5 (= ${binary:Version}),
......
etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
etc/systemd/system/mariadb.service.d/tokudb.conf
usr/bin/tokuft_logprint
usr/bin/tokuftdump
usr/lib/mysql/plugin/ha_tokudb.so
usr/share/doc/mariadb-server-10.5/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
usr/share/man/man1/tokuft_logprint.1
usr/share/man/man1/tokuftdump.1
...@@ -43,13 +43,6 @@ ifeq (32,$(DEB_HOST_ARCH_BITS)) ...@@ -43,13 +43,6 @@ ifeq (32,$(DEB_HOST_ARCH_BITS))
CMAKEFLAGS += -DWITHOUT_ROCKSDB=true CMAKEFLAGS += -DWITHOUT_ROCKSDB=true
endif endif
# Skip TokuDB if arch is not amd64 (also disable for kfreebsd-amd64 as it FTBFS)
# Skipped on the x32 ABI too; untested, but unlikely to work given i386 is not
# supported.
ifneq ($(DEB_HOST_ARCH),amd64)
CMAKEFLAGS += -DWITHOUT_TOKUDB=true
endif
# Add extra flag to avoid WolfSSL code crashing the entire mysqld on s390x. This # Add extra flag to avoid WolfSSL code crashing the entire mysqld on s390x. This
# can be removed once upstream has made the code s390x compatible, see # can be removed once upstream has made the code s390x compatible, see
# https://jira.mariadb.org/browse/MDEV-21705 and # https://jira.mariadb.org/browse/MDEV-21705 and
...@@ -92,6 +85,7 @@ endif ...@@ -92,6 +85,7 @@ endif
-DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \ -DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \
-DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \ -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DWITHOUT_TOKUDB=true \
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \ -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
-DDEB=$(DEB_VENDOR) ..' -DDEB=$(DEB_VENDOR) ..'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment