From 61dbb45bfae80b49b310aca3926d4a2d31adf4f6 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Fri, 13 Mar 2026 18:12:57 +1100
Subject: [PATCH 1/2] MDEV-30953: mariadb-server-galera package

The ldd differences need to account that
this is a new 12.3 package.
---
 scripts/bash_lib.sh    |  6 ++++++
 scripts/deb-upgrade.sh | 11 +++++++++++
 scripts/rpm-upgrade.sh | 11 +++++++++++
 3 files changed, 28 insertions(+)

diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh
index c3cbbc18..b4ff3a44 100644
--- a/scripts/bash_lib.sh
+++ b/scripts/bash_lib.sh
@@ -765,6 +765,12 @@ check_upgraded_versions() {
         fi
       ;;
     esac
+    # Remove after Q2 2026 release MDEV-30953 Add mariadb-server-galera package - 12.3+
+    sed -i -e '/^WSREP_/s/NOT INSTALLED/ACTIVE/g'  ./plugins-*.cmp
+    # mariadb-test now depends on mariadb-galera-server - and RPM had the
+    # second expression change.
+    sed -i -e 's/Depends: mariadb-server$/Depends: mariadb-server-galera/' \
+	   -e 's/MariaDB-common/MariaDB-server-galera/' ./reqs-*.cmp
 
     # Remove after Q4 2025 release - MDEV-37600 - 11.4 onwards
     sed -i '/auth_mysql_sha2.so/,/^\===/ { /^\===/!d; /auth_mysql_sha2.so/d }' ./ldd-*.cmp
diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh
index 2d29f986..06fef2ae 100755
--- a/scripts/deb-upgrade.sh
+++ b/scripts/deb-upgrade.sh
@@ -52,6 +52,14 @@ get_packages_file_mirror() {
   set +u
 }
 
+# This function updates package_list to include mariadb-server-galera
+# if available
+update_to_include_mariadb_server_galera() {
+  if grep -qi mariadb-server-galera Packages; then
+    package_list="${package_list} mariadb-server-galera"
+  fi
+}
+
 # Define the list of packages to install/upgrade
 case $test_mode in
   all)
@@ -76,12 +84,15 @@ case $test_mode in
     ;;
   deps)
     package_list="mariadb-server mariadb-client mariadb-common mariadb-test mysql-common libmysqlclient18"
+    update_to_include_mariadb_server_galera
     ;;
   server)
     package_list=mariadb-server
+    update_to_include_mariadb_server_galera
     ;;
   columnstore)
     package_list="mariadb-server mariadb-plugin-columnstore"
+    update_to_include_mariadb_server_galera
     ;;
   *)
     bb_log_err "unknown test mode: $test_mode"
diff --git a/scripts/rpm-upgrade.sh b/scripts/rpm-upgrade.sh
index e3410cce..61c68601 100755
--- a/scripts/rpm-upgrade.sh
+++ b/scripts/rpm-upgrade.sh
@@ -37,6 +37,15 @@ rpm_pkg_makecache
 
 rpm_setup_mariadb_mirror "$prev_major_version"
 
+
+# This function updates package_list to include MariaDB-server-galera
+# if available
+update_to_include_mariadb_server_galera() {
+  if [[ "$(rpm_repoquery)" =~ MariaDB-server-galera ]]; then
+    package_list="${package_list} MariaDB-server-galera"
+  fi
+}
+
 # Define the list of packages to install/upgrade
 case $test_mode in
   all)
@@ -49,6 +58,7 @@ case $test_mode in
     ;;
   server)
     package_list="MariaDB-server MariaDB-client"
+    update_to_include_mariadb_server_galera
     alternative_names_package_list=$package_list
     if [[ "$test_type" == "distro" ]]; then
       if [[ "$ID_LIKE" =~ ^suse.* ]]; then
@@ -60,6 +70,7 @@ case $test_mode in
     ;;
   columnstore)
     package_list="MariaDB-server MariaDB-columnstore-engine"
+    update_to_include_mariadb_server_galera
     alternative_names_package_list=$package_list
     ;;
   *)

From 71e89ddacf13d71cdb86895a52083f1abce05d91 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Tue, 17 Mar 2026 14:02:37 +1100
Subject: [PATCH 2/2] MDEV-30953 - handle wsrep_info.so

using gawk as sed couldn't handle a multiline  inclusive removal
---
 scripts/bash_lib.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh
index b4ff3a44..8f4ae2ee 100644
--- a/scripts/bash_lib.sh
+++ b/scripts/bash_lib.sh
@@ -753,6 +753,12 @@ check_upgraded_versions() {
     # Remove after Q2 2026 release (MDEV-38913) - deb re-adds mtr pamv1 test module
     sed -i '/libc6/d;/libpam0g/d' ./reqs-*.cmp
 
+    # Remove after Q2 2026 release MDEV-30953 Add mariadb-server-galera package
+    # adds wsrep_info to mariadb-server-galera
+    gawk -i inplace '/^=== \/usr\/lib(64)?\/mysql\/plugin\/wsrep_info.so/ { skip=1; next }
+                     skip && /^\t/ { next }
+                     { skip=0; print }' ldd-*.cmp
+
     # Remove after Q4 2025 release (MDEV-37680) - fedora adds mysql-selinux module
     # dependency
     sed -i '/mysql-selinux/d;/rpmlib(RichDependencies)/d' ./reqs-*.cmp