From 3ce0d41bd5bdcdefbc554cff7336166e82c83e66 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 13 Apr 2022 13:21:30 +0000
Subject: [PATCH] mariadb: update to 10.4.22 and addon (106)

TokuDB's configure script seems somewhat broken when it comes to
cross-compilation so we shall disable it and also disable TokuDB.

Additionally TokuDB has been deprecated in MariaDB 10.5.y.
---
 packages/addons/service/mariadb/changelog.txt | 5 +++++
 packages/addons/service/mariadb/package.mk    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/mariadb/changelog.txt b/packages/addons/service/mariadb/changelog.txt
index 77469e370a..de257bab2b 100644
--- a/packages/addons/service/mariadb/changelog.txt
+++ b/packages/addons/service/mariadb/changelog.txt
@@ -1,3 +1,8 @@
+106
+- update MariaDB to 10.4.22
+- drop support for TokuDB, it is deprecated in 10.5.y and is not
+  supported when being cross_compiled
+
 105
 - update MariaDB to 10.4.21
 
diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk
index 03ddb53022..03c19e580d 100644
--- a/packages/addons/service/mariadb/package.mk
+++ b/packages/addons/service/mariadb/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mariadb"
-PKG_VERSION="10.4.21"
-PKG_REV="105"
-PKG_SHA256="94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d"
+PKG_VERSION="10.4.22"
+PKG_REV="106"
+PKG_SHA256="44bdc36eeb02888296e961718bae808f3faab268ed49160a785248db60500c00"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
 PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@@ -42,6 +42,7 @@ configure_package() {
     -DWITH_SSL=system \
     -DWITH_SSL=${SYSROOT_PREFIX}/usr \
     -DWITH_JEMALLOC=OFF \
+    -DWITHOUT_TOKUDB=1 \
     -DWITH_PCRE=bundled \
     -DWITH_ZLIB=bundled \
     -DWITH_EDITLINE=bundled \