From 1d76fdfcb9aeee1782ddc32ee8f5d5abd33c3a06 Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Tue, 29 Oct 2024 16:09:56 +0100 Subject: [PATCH] Adapt galera_sr.GCF-572 to make it work with innodb-snapshot-isolation Make galera_sr.GCF-572 behave the same with and without option innodb-snapshot-isolation. It is sufficient to remove a SELECT statement from a transaction to delay the creation of the read view in innodb. Avoiding the detection of a write-write conflict under innodb-snapshot-isolation. --- mysql-test/suite/galera_sr/r/GCF-572.result | 3 +-- mysql-test/suite/galera_sr/t/GCF-572.test | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mysql-test/suite/galera_sr/r/GCF-572.result b/mysql-test/suite/galera_sr/r/GCF-572.result index 41ae2378a3f..b28ce1ae346 100644 --- a/mysql-test/suite/galera_sr/r/GCF-572.result +++ b/mysql-test/suite/galera_sr/r/GCF-572.result @@ -37,8 +37,6 @@ f1 f2 SET SESSION wsrep_trx_fragment_size = 10000; START TRANSACTION; INSERT INTO t1 VALUE (10, 'node1'); -SELECT * FROM mysql.wsrep_streaming_log; -node_uuid trx_id seqno flags frag connection node_1a; INSERT INTO t1 VALUES(15, 'node2'); connection node_1; @@ -47,6 +45,7 @@ f1 f2 1 node1 5 node2 10 node1 +15 node2 INSERT INTO t1 VALUES(15, 'node1'); ERROR 23000: Duplicate entry '15' for key 'PRIMARY' COMMIT; diff --git a/mysql-test/suite/galera_sr/t/GCF-572.test b/mysql-test/suite/galera_sr/t/GCF-572.test index be77451a332..b9bd90d1a96 100644 --- a/mysql-test/suite/galera_sr/t/GCF-572.test +++ b/mysql-test/suite/galera_sr/t/GCF-572.test @@ -61,7 +61,6 @@ SET SESSION wsrep_trx_fragment_size = 10000; START TRANSACTION; INSERT INTO t1 VALUE (10, 'node1'); -SELECT * FROM mysql.wsrep_streaming_log; --connection node_1a INSERT INTO t1 VALUES(15, 'node2');