From 456396b023a11826f7e6c8dd0c54532b635e65f0 Mon Sep 17 00:00:00 2001
From: Pekka Lampio <pekka.lampio@galeracluster.com>
Date: Mon, 9 Feb 2026 10:31:35 +0200
Subject: [PATCH] MDEV-38385 Galera test failure on MDEV-30418

Fix for the sporadically failing MTR test "galera.MDEV-30418".
---
 mysql-test/suite/galera/r/MDEV-30418.result | 2 ++
 mysql-test/suite/galera/t/MDEV-30418.test   | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/mysql-test/suite/galera/r/MDEV-30418.result b/mysql-test/suite/galera/r/MDEV-30418.result
index 67ea6462c4160..9f4264983600e 100644
--- a/mysql-test/suite/galera/r/MDEV-30418.result
+++ b/mysql-test/suite/galera/r/MDEV-30418.result
@@ -2,7 +2,9 @@ connection node_2;
 connection node_1;
 connection node_1;
 connection node_2;
+SET SESSION wsrep_sync_wait=0;
 connection node_2;
+SET SESSION wsrep_sync_wait=0;
 select @@wsrep_slave_threads;
 @@wsrep_slave_threads
 1
diff --git a/mysql-test/suite/galera/t/MDEV-30418.test b/mysql-test/suite/galera/t/MDEV-30418.test
index 740fd8f8b5eb0..4c5421652f849 100644
--- a/mysql-test/suite/galera/t/MDEV-30418.test
+++ b/mysql-test/suite/galera/t/MDEV-30418.test
@@ -5,7 +5,9 @@
 --let $node_2=node_2
 --source ../galera/include/auto_increment_offset_save.inc
 
+SET SESSION wsrep_sync_wait=0;
 --connection node_2
+SET SESSION wsrep_sync_wait=0;
 select @@wsrep_slave_threads;
 SET @cluster_address_orig = @@wsrep_cluster_address;
 SET GLOBAL wsrep_cluster_address=AUTO;
@@ -23,6 +25,13 @@ SHOW WARNINGS;
 --disable_query_log
 SET GLOBAL wsrep_cluster_address = @cluster_address_orig;
 --enable_query_log
+
+# wait (without using SELECT) for the cluster becoming ready for all SQL statements
+let $show_statement= SHOW STATUS LIKE 'wsrep_ready';
+let $field= Value;
+let $condition= = 'ON';
+--source include/wait_show_condition.inc
+
 select @@wsrep_slave_threads;
 show status like 'wsrep_cluster_size';
 show status like 'wsrep_cluster_status';