rpl.rpl_mariadb_slave_capability 'innodb,row' w3 [ fail ]

        Test ended at 2023-03-16 17:02:49

CURRENT_TEST: rpl.rpl_mariadb_slave_capability

--- /usr/share/mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result	2023-03-16 15:39:35.000000000 +0000

+++ /dev/shm/var/3/log/rpl_mariadb_slave_capability.reject	2023-03-16 17:02:48.667830165 +0000

@@ -23,6 +23,7 @@

 INSERT INTO t1 /* A comment just to make the annotate event sufficiently long that the dummy event will need to get padded with spaces so that we can test that this works */ VALUES(1);

 include/show_binlog_events.inc

 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

+master-bin.000002	#	Binlog_checkpoint	#	#	master-bin.000002

 master-bin.000002	#	Gtid	#	#	BEGIN GTID #-#-#

 master-bin.000002	#	Annotate_rows	#	#	DELETE FROM t1

 master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)

@@ -32,7 +33,6 @@

 master-bin.000002	#	Annotate_rows	#	#	INSERT INTO t1 /* A comment just to make the annotate event sufficiently long that the dummy event will need to get padded with spaces so that we can test that this works */ VALUES(1)

 master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)

 master-bin.000002	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F

-master-bin.000002	#	Query	#	#	COMMIT

 connection slave;

 connection slave;

 SELECT * FROM t1;

@@ -40,6 +40,7 @@

 1

 include/show_events.inc

 Log_name	Pos	Event_type	Server_id	End_log_pos	Info

+slave-relay-bin.000005	#	Query	#	#	# Dummy

 slave-relay-bin.000005	#	Query	#	#	BEGIN

 slave-relay-bin.000005	#	Annotate_rows	#	#	DELETE FROM t1

 slave-relay-bin.000005	#	Table_map	#	#	table_id: # (test.t1)

@@ -49,7 +50,6 @@

 slave-relay-bin.000005	#	Annotate_rows	#	#	INSERT INTO t1 /* A comment just to make the annotate event sufficiently long that the dummy event will need to get padded with spaces so that we can test that this works */ VALUES(1)

 slave-relay-bin.000005	#	Table_map	#	#	table_id: # (test.t1)

 slave-relay-bin.000005	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F

-slave-relay-bin.000005	#	Query	#	#	COMMIT

 set @@global.debug_dbug= @old_dbug;

 # Test dummy event is checksummed correctly.

 connection master;

mysqltest: Result length mismatch

diff --git a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test

index 046a65f77db..049dd36a860 100644

--- a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test

+++ b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test

@@ -39,6 +39,7 @@ SET SESSION binlog_annotate_row_events = ON;

 let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);

 let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);

 # A short event, to test when we need to use user_var_event for dummy event.

+--sleep 0.1

 DELETE FROM t1;

 INSERT INTO t1 /* A comment just to make the annotate event sufficiently long that the dummy event will need to get padded with spaces so that we can test that this works */ VALUES(1);

 let $binlog_limit= 0, 10;

diff --git a/sql/log.cc b/sql/log.cc

index 59730c3205a..48269e92a0c 100644

--- a/sql/log.cc

+++ b/sql/log.cc

@@ -10210,6 +10210,7 @@ binlog_background_thread(void *arg __attribute__((unused)))

       /* Grab next pointer first, as mark_xid_done() may free the element. */

       next= queue->next_in_queue;

       queue->notify_count= 0;

+my_sleep(20000);

       for (long i= 0; i <= count; i++)

         mysql_bin_log.mark_xid_done(queue->binlog_id, true);

       queue= next;