git » mariadb.git » commit 2de6ad2

upgpkg: 11.6.2-2: cherry-pick MDEV-35398 Improve shrinking of system tablespace

author Christian Hesse
2024-11-21 11:49:04 UTC
committer Christian Hesse
2024-11-21 11:49:04 UTC
parent 14ebf0f62b67ae17fc963f5543204fc71854e12c

upgpkg: 11.6.2-2: cherry-pick MDEV-35398 Improve shrinking of system tablespace

.SRCINFO +1 -1
PKGBUILD +5 -1

diff --git a/.SRCINFO b/.SRCINFO
index 84d5dbc..32b39aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mariadb
 	pkgdesc = Fast SQL database server, derived from MySQL
 	pkgver = 11.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mariadb.org/
 	arch = x86_64
 	license = GPL-2.0-only
diff --git a/PKGBUILD b/PKGBUILD
index 17ae863..fa5cbe0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
 pkgver=11.6.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL-2.0-only')
 url='https://mariadb.org/'
@@ -48,6 +48,10 @@ prepare() {
   git submodule init
   git -c protocol.file.allow=always submodule update
 
+  # MDEV-35398 Improve shrinking of system tablespace
+  git cherry-pick -n \
+    866a8ea6736d2edc0f6be552d1cdd6810c10d5ab
+
   # Arch Linux specific patches:
   #  * enable PrivateTmp for a little bit more security
   #  * force preloading jemalloc for memory management