MDEV-22729: Additional fix for branch 10.5

mysql-test/suite/galera/t/galera_slave_replay.cnf

+!include ../galera_2nodes_as_slave.cnf

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,7 +32,7 @@ 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;

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();