From 008145b968518f1ccf22558ee15fbc146f1b204b Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Thu, 17 Jul 2025 17:21:02 +0200
Subject: [PATCH] galera: changes for transition to galera library 26.4.23

---
 mysql-test/include/galera_variables_ok.inc      | 2 +-
 mysql-test/suite/wsrep/r/variables.result       | 2 --
 mysql-test/suite/wsrep/r/variables_debug.result | 3 +++
 mysql-test/suite/wsrep/t/variables.test         | 2 +-
 mysql-test/suite/wsrep/t/variables_debug.test   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc
index 4d9c71e47d8..9bd31bb32b2 100644
--- a/mysql-test/include/galera_variables_ok.inc
+++ b/mysql-test/include/galera_variables_ok.inc
@@ -5,7 +5,7 @@ if (!$_galera_variables_delta) {
 --let $galera_variables_delta=0
 }
 
---let $galera_variables_expected=`SELECT 49 + $galera_variables_delta`
+--let $galera_variables_expected=`SELECT 51 + $galera_variables_delta`
 
 --let $galera_variables_count=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'`
 
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result
index c8150a2f0b0..592e5ef1b73 100644
--- a/mysql-test/suite/wsrep/r/variables.result
+++ b/mysql-test/suite/wsrep/r/variables.result
@@ -108,8 +108,6 @@ WSREP_FORCED_BINLOG_FORMAT
 WSREP_GTID_DOMAIN_ID
 WSREP_GTID_MODE
 WSREP_GTID_SEQ_NO
-WSREP_MODE
-WSREP_STRICT_DDL
 WSREP_IGNORE_APPLY_ERRORS
 WSREP_LOAD_DATA_SPLITTING
 WSREP_LOG_CONFLICTS
diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result
index 36f9b4ec256..18a323054d6 100644
--- a/mysql-test/suite/wsrep/r/variables_debug.result
+++ b/mysql-test/suite/wsrep/r/variables_debug.result
@@ -108,11 +108,13 @@ WSREP_DRUPAL_282555_WORKAROUND
 WSREP_FORCED_BINLOG_FORMAT
 WSREP_GTID_DOMAIN_ID
 WSREP_GTID_MODE
+WSREP_GTID_SEQ_NO
 WSREP_IGNORE_APPLY_ERRORS
 WSREP_LOAD_DATA_SPLITTING
 WSREP_LOG_CONFLICTS
 WSREP_MAX_WS_ROWS
 WSREP_MAX_WS_SIZE
+WSREP_MODE
 WSREP_MYSQL_REPLICATION_BUNDLE
 WSREP_NODE_ADDRESS
 WSREP_NODE_INCOMING_ADDRESS
@@ -138,6 +140,7 @@ WSREP_SST_DONOR_REJECTS_QUERIES
 WSREP_SST_METHOD
 WSREP_SST_RECEIVE_ADDRESS
 WSREP_START_POSITION
+WSREP_STRICT_DDL
 WSREP_SYNC_WAIT
 WSREP_TRX_FRAGMENT_SIZE
 WSREP_TRX_FRAGMENT_UNIT
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test
index 762d783a09c..c82d0ae02c2 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -3,7 +3,7 @@
 --source include/have_innodb.inc
 --source include/galera_no_debug_sync.inc
 
---let $galera_version=26.4.21
+--let $galera_version=26.4.23
 source include/check_galera_version.inc;
 
 source include/galera_variables_ok.inc;
diff --git a/mysql-test/suite/wsrep/t/variables_debug.test b/mysql-test/suite/wsrep/t/variables_debug.test
index e55dbd4fa1f..e50cee28a15 100644
--- a/mysql-test/suite/wsrep/t/variables_debug.test
+++ b/mysql-test/suite/wsrep/t/variables_debug.test
@@ -5,7 +5,7 @@
 --source include/have_debug_sync.inc
 --source include/galera_have_debug_sync.inc
 
---let $galera_version=26.4.21
+--let $galera_version=26.4.23
 source include/check_galera_version.inc;
 
 source include/galera_variables_ok_debug.inc;