From bcb991ae4f26a52be6c84a0dee828de535d3b18b Mon Sep 17 00:00:00 2001
From: xiejing <xiejing@kylinos.cn>
Date: Thu, 28 Aug 2025 18:21:25 -0700
Subject: [PATCH] Disable provider_* plugin by default to fix systemd service
 start error

(cherry picked from commit 8876269ef83839539ec7f1c97c5383442f4bed4a)
---
 mariadb.spec      | 17 ++++++++++++++++-
 mysql.service.in  |  2 +-
 mysql@.service.in |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 92660fc..c3b22cb 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -74,7 +74,7 @@
 
 Name:             mariadb
 Version:          11.8.3
-Release:          1
+Release:          2
 Epoch:            4
 
 Summary:          A very fast and robust SQL database server
@@ -912,6 +912,18 @@ sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.
 sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
 %endif
 
+# Disable plugins below for current default plugin_dir definition occurs plugin loading error
+sed -i 's/^plugin_load_add/#plugin_load_add/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_snappy.cnf
+sed -i 's/^provider_snappy/#provider_snappy/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_snappy.cnf
+sed -i 's/^plugin_load_add/#plugin_load_add/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lzo.cnf
+sed -i 's/^provider_lzo/#provider_lzo/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lzo.cnf
+sed -i 's/^plugin_load_add/#plugin_load_add/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lzma.cnf
+sed -i 's/^provider_lzma/#provider_lzma/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lzma.cnf
+sed -i 's/^plugin_load_add/#plugin_load_add/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lz4.cnf
+sed -i 's/^provider_lz4/#provider_lz4/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_lz4.cnf
+sed -i 's/^plugin_load_add/#plugin_load_add/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_bzip2.cnf
+sed -i 's/^provider_bzip2/#provider_bzip2/' %{buildroot}%{_sysconfdir}/my.cnf.d/provider_bzip2.cnf
+
 # Fix Galera Replication config file
 #   The replication requires cluster address upon startup (which is end-user specific).
 #   Disable it entirely, rather than have it failing out-of-the-box.
@@ -1461,6 +1473,9 @@ fi
 %endif
 
 %changelog
+* Fri Aug 29 2025 xiejing <xiejing@kylinos.cn> - 4:11.8.3-2
+- Disable provider_* plugin by default to fix systemd service start error
+
 * Thu Aug 07 2025 Funda Wang <fundawang@yeah.net> - 4:11.8.3-1
 - update to 11.8.3
 
diff --git a/mysql.service.in b/mysql.service.in
index ae12df9..e4f5217 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -17,7 +17,7 @@
 #
 
 [Unit]
-Description=MariaDB 10.5.25 database server
+Description=MariaDB 11.8.3 database server
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
diff --git a/mysql@.service.in b/mysql@.service.in
index f250f51..193ccde 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -39,7 +39,7 @@
 #	LimitNOFILE=10000
 
 [Unit]
-Description=MariaDB 10.5.25 database server (multi-instance %I)
+Description=MariaDB 11.8.3 database server (multi-instance %I)
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
-- 
Gitee