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

sysprg · sysprg · commit c3fdfbdbd82c · 2023-11-11T15:02:40.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`#`
`4`	`4`	`# The galera/galera_2node_slave.cnf describes the setup of the nodes`
`5`	`5`	`#`
`6`		`---source include/big_test.inc`
`7`	`6`	`--source include/force_restart.inc`
`8`	`7`	`--source include/galera_cluster.inc`
	`8`	`+--source include/have_innodb.inc`
`9`	`9`	`--source include/have_sequence.inc`
`10`	`10`
`11`	`11`	`# As node #3 is not a Galera node, and galera_cluster.inc does not open connetion to it`
Original file line number	Diff line number	Diff line change
`@@ -703,6 +703,7 @@ rpl_slave_state::record_gtid(THD thd, const rpl_gtid gtid, uint64 sub_id,`
`703`	`703`	`if (WSREP_ON_ && wsrep_thd_is_local(thd))`
`704`	`704`	`{`
`705`	`705`	`thd->wsrep_ignore_table= false;`
	`706`	`+ table->file->row_logging= 1; // replication requires binary logging`
`706`	`707`	`wsrep_start_trx_if_not_started(thd);`
`707`	`708`	`}`
`708`	`709`	`else`