diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-23 14:19:36 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-06-24 13:02:37 +0200 |
| commit | 198a4fee3cdd800b24845acdb9cf986e13a9e757 (patch) | |
| tree | c23d4e7714cc7c997f1594c5287ce8bd434165e3 | |
| parent | 0c0f9de40b033812e8eb2bc994731e6fa9ccb3c8 (diff) | |
| download | mariadb-git-10.5-MDEV-22729.tar.gz | |
MDEV-22729: Additional fix for branch 10.510.5-MDEV-22729
| -rw-r--r-- | mysql-test/suite/galera/t/galera_slave_replay.cnf | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_slave_replay.test | 5 | ||||
| -rw-r--r-- | sql/service_wsrep.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/suite/galera/t/galera_slave_replay.cnf b/mysql-test/suite/galera/t/galera_slave_replay.cnf new file mode 100644 index 00000000000..9449ec9cf40 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_slave_replay.cnf @@ -0,0 +1 @@ +!include ../galera_2nodes_as_slave.cnf diff --git a/mysql-test/suite/galera/t/galera_slave_replay.test b/mysql-test/suite/galera/t/galera_slave_replay.test index bac394baf64..f1500eeaeaa 100644 --- a/mysql-test/suite/galera/t/galera_slave_replay.test +++ b/mysql-test/suite/galera/t/galera_slave_replay.test @@ -7,6 +7,7 @@ # --source include/have_innodb.inc +--source include/have_log_bin.inc --source include/have_debug.inc --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc @@ -31,10 +32,10 @@ RESET MASTER; # -# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB naster in node 3 +# nodes 1 and 2 form a galera cluster, node 2 operates as slave for native MariaDB master in node 3 # --disable_query_log ---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; +--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3; --enable_query_log START SLAVE; diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index 4137454e19b..6b06bddd773 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -313,7 +313,8 @@ extern "C" void wsrep_commit_ordered(THD *thd) { thd->wsrep_last_written_gtid_seqno= thd->wsrep_current_gtid_seqno; } - if (!wsrep_commit_will_write_binlog(thd)) + if (thd->wsrep_trx().state() != wsrep::transaction::s_ordered_commit && + !wsrep_commit_will_write_binlog(thd)) { DEBUG_SYNC(thd, "before_wsrep_ordered_commit"); thd->wsrep_cs().ordered_commit(); |