Skip to content

Commit abe59ff

Browse files
MDEV-34124: Make sequences work with streaming replication
- extend galera_sequences_transaction test with streaming replication combinations (it demonstrates the exact results compared to the regular Wsrep replication) - remove MDEV-28971 test as it's not applicable after fixing the binlog statement cache replication with Wsrep
1 parent f84087c commit abe59ff

File tree

5 files changed

+16
-46
lines changed

5 files changed

+16
-46
lines changed

mysql-test/suite/galera/t/galera_sequences_recovery.combinations

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ log-bin
33
log-slave-updates
44

55
[binlogoff]
6+
7+
[binlogon-sr]
8+
log-bin
9+
log-slave-updates
10+
wsrep-trx-fragment-size=1
11+
12+
[binlogoff-sr]
13+
wsrep-trx-fragment-size=1

mysql-test/suite/galera/t/galera_sequences_transaction.combinations

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ log-bin
33
log-slave-updates
44

55
[binlogoff]
6+
7+
[binlogon-sr]
8+
log-bin
9+
log-slave-updates
10+
wsrep-trx-fragment-size=1
11+
12+
[binlogoff-sr]
13+
wsrep-trx-fragment-size=1

mysql-test/suite/galera_sr/r/MDEV-28971.result

Lines changed: 0 additions & 17 deletions
This file was deleted.

mysql-test/suite/galera_sr/t/MDEV-28971.test

Lines changed: 0 additions & 21 deletions
This file was deleted.

sql/ha_sequence.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,6 @@ int ha_sequence::write_row(const uchar *buf)
273273
#ifdef WITH_WSREP
274274
if (WSREP_ON && WSREP(thd) && wsrep_thd_is_local(thd))
275275
{
276-
if (sequence_locked &&
277-
(wsrep_thd_is_SR(thd) || wsrep_streaming_enabled(thd)))
278-
{
279-
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
280-
"SEQUENCEs with streaming replication in Galera cluster");
281-
DBUG_RETURN(HA_ERR_UNSUPPORTED);
282-
}
283-
284276
/*
285277
We need to start Galera transaction for select NEXT VALUE FOR
286278
sequence if it is not yet started. Note that ALTER is handled

0 commit comments

Comments
 (0)