[rpms/mariadb10.11] rawhide: [bugfix] Remove deprecated option in the default Galera config

[Michal Schorm <mschorm@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/mariadb10.11
            Branch : rawhide
            Commit : dc048d316276a445fc98a91c449c9f7d5b6d3352
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-05-26T16:12:22+02:00
            Stats  : +38/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/mariadb10.11/c/dc048d316276a445fc98a91c449c9f7d5b6d3352?branch=rawhide

            Log:
            [bugfix] Remove deprecated option in the default Galera config

Upstream PR: https://github.com/MariaDB/server/pull/5104/changes
Upstream tracker: MDEV-39691

Downstream test: https://gitlab.com/redhat/centos-stream/tests/mariadb/-/tree/main/Sanity/mariadb-migrate-config-file

This has been added to MariaDB 10.11 only in Rawhide and should not be
manually added to stable Fedora and/or RHEL versions manually.
It was added for testing purposes and even though it should be a change
with no impact it is better to be safe than sorry.

---
diff --git a/mariadb10.11.spec b/mariadb10.11.spec
index dafbed1..b33234f 100644
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@@ -259,6 +259,8 @@ Patch13:          %{majorname}-libfmt.patch
 Patch14:          %{majorname}-mtr.patch
 #   Patch15: mark RISC-V64 as 64-bit architecture
 Patch15:          mark-RISC-V64-as-64-bit-architecture.patch
+#   Patch16: fix default Galera configuation file
+Patch16:          upstream_0a66c466f1772945d46b12bd340e1bd9adff4e9b.patch
 
 # This macro is used for package/sub-package names in the entire specfile
 %if %?mariadb_default
@@ -877,6 +879,8 @@ rm -r storage/rocksdb/
 %patch -P14 -p1
 %patch -P15 -p1
 
+%patch -P16 -p1
+
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
 

diff --git a/upstream_0a66c466f1772945d46b12bd340e1bd9adff4e9b.patch b/upstream_0a66c466f1772945d46b12bd340e1bd9adff4e9b.patch
new file mode 100644
index 0000000..bb74435
--- /dev/null
+++ b/upstream_0a66c466f1772945d46b12bd340e1bd9adff4e9b.patch
@@ -0,0 +1,34 @@
+Patch for MDEV-39691 from this upstream PR:
+https://github.com/MariaDB/server/pull/5104/changes/0a66c466f1772945d46b12bd340e1bd9adff4e9b
+
+
+
+From 0a66c466f1772945d46b12bd340e1bd9adff4e9b Mon Sep 17 00:00:00 2001
+From: Daniel Black <daniel@mariadb.org>
+Date: Thu, 21 May 2026 15:08:01 +1000
+Subject: [PATCH] MDEV-39691 wsrep.cnf contains deprecated wsrep_causal_reads
+
+wsrep_causal_reads was deprecated in 10.1.3 and removed in 11.3.1.
+Put in place the equivalent (and default) wsrep_sync_wait=0.
+
+Amend a few early comments to show MariaDB as our product.
+---
+ support-files/wsrep.cnf.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh
+index 7242fff9f7ac0..54d67d951d3b2 100644
+--- a/support-files/wsrep.cnf.sh
++++ b/support-files/wsrep.cnf.sh
+@@ -87,8 +87,9 @@ wsrep_auto_increment_control=1
+ # retry autoinc insert, which failed for duplicate key error
+ wsrep_drupal_282555_workaround=0
+ 
+-# enable "strictly synchronous" semantics for read operations
+-wsrep_causal_reads=0
++# Syncronization causality setting, (0 - disabled)
++# same as deprecated and removed wsrep_causal_reads=0.
++wsrep_sync_wait=0
+ 
+ # Command to call when node status or cluster membership changes.
+ # Will be passed all or some of the following options: