From abe57f0b5158d5838d4b522f47c942cc4644c0f4 Mon Sep 17 00:00:00 2001 From: Pekka Lampio Date: Thu, 4 Jun 2026 16:39:55 +0300 Subject: [PATCH] MDEV-38389: Galera test failure on galera_3nodes.galera_vote_majority_dml Fix the broken Galera MTR test galera_3nodes.galera_vote_majority_dml by restoring the value of the AUTO_INCREMENT_OFFSET at the end of the test. --- .../galera_3nodes/r/galera_vote_majority_dml.result | 6 +++++- .../galera_3nodes/t/galera_vote_majority_dml.test | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera_3nodes/r/galera_vote_majority_dml.result b/mysql-test/suite/galera_3nodes/r/galera_vote_majority_dml.result index cef1583eebcb2..b8d5393a75ead 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_vote_majority_dml.result +++ b/mysql-test/suite/galera_3nodes/r/galera_vote_majority_dml.result @@ -1,7 +1,11 @@ connection node_2; connection node_1; -CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 BLOB) ENGINE=InnoDB; connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; +connection node_1; +connection node_2; +connection node_3; +connection node_1; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 BLOB) ENGINE=InnoDB; connection node_3; SET GLOBAL wsrep_on=OFF; ALTER TABLE t1 MODIFY f2 LONGTEXT; diff --git a/mysql-test/suite/galera_3nodes/t/galera_vote_majority_dml.test b/mysql-test/suite/galera_3nodes/t/galera_vote_majority_dml.test index af2a7c1427feb..284a085241837 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_vote_majority_dml.test +++ b/mysql-test/suite/galera_3nodes/t/galera_vote_majority_dml.test @@ -6,9 +6,17 @@ --source include/galera_cluster.inc --source include/have_perfschema.inc +--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 + +# Save original auto_increment_offset values. +--let $node_1=node_1 +--let $node_2=node_2 +--let $node_3=node_3 +--source ../galera/include/auto_increment_offset_save.inc + +--connection node_1 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 BLOB) ENGINE=InnoDB; ---connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --connection node_3 SET GLOBAL wsrep_on=OFF; ALTER TABLE t1 MODIFY f2 LONGTEXT; # Introducing schema inconsistency @@ -66,3 +74,6 @@ CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 3, seqno"); --connection node_3 CALL mtr.add_suppression("Vote 0 \\(success\\) on (.*) is inconsistent with group. Leaving cluster."); CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown"); + +# Restore original auto_increment_offset values. +--source ../galera/include/auto_increment_offset_restore.inc