MDEV-31413: post-fix for 10.5+ (galera_restart_replica test failures)

MariaDB · Nov 11, 2023 · c3fdfbd · c3fdfbd
1 parent e0c6578
commit c3fdfbd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mysql-test/suite/galera/t/galera_restart_replica.test b/mysql-test/suite/galera/t/galera_restart_replica.test
@@ -3,9 +3,9 @@
 #
 # The galera/galera_2node_slave.cnf describes the setup of the nodes
 #
---source include/big_test.inc
 --source include/force_restart.inc
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source include/have_sequence.inc
 
 # As node #3 is not a Galera node, and galera_cluster.inc does not open connetion to it

diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
@@ -703,6 +703,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id,
   if (WSREP_ON_ && wsrep_thd_is_local(thd))
   {
     thd->wsrep_ignore_table= false;
+    table->file->row_logging= 1; // replication requires binary logging
     wsrep_start_trx_if_not_started(thd);
   }
   else