MDEV-7070: rpl.rpl_innodb_bug68220 fails in buildbot

mysql-test/suite/rpl/r/rpl_innodb_bug68220.result

 include/master-slave.inc
 [connection master]
-DROP TABLE IF EXISTS testdb.t1;
-DROP DATABASE IF EXISTS testdb;
 select variable_value into @master_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read';
 select variable_value into @master_rows_updated from information_schema.global_status where variable_name = 'innodb_rows_updated';
 select variable_value into @master_rows_deleted from information_schema.global_status where variable_name = 'innodb_rows_deleted';
@@ -75,7 +73,7 @@ select @rows_inserted - @slave_rows_inserted;
 select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read';
 select @system_rows_read - @slave_system_rows_read;
 @system_rows_read - @slave_system_rows_read
-3
+0
 select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated';
 select @system_rows_updated - @slave_system_rows_updated;
 @system_rows_updated - @slave_system_rows_updated
@@ -83,11 +81,11 @@ select @system_rows_updated - @slave_system_rows_updated;
 select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted';
 select @system_rows_deleted - @slave_system_rows_deleted;
 @system_rows_deleted - @slave_system_rows_deleted
-3
+0
 select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted';
 select @system_rows_inserted - @slave_system_rows_inserted;
 @system_rows_inserted - @slave_system_rows_inserted
-3
+0
 UPDATE t1 SET i=2 WHERE i=1;
 ==========MASTER==========
 select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read';
@@ -142,7 +140,7 @@ select @rows_inserted - @slave_rows_inserted;
 select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read';
 select @system_rows_read - @slave_system_rows_read;
 @system_rows_read - @slave_system_rows_read
-4
+0
 select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated';
 select @system_rows_updated - @slave_system_rows_updated;
 @system_rows_updated - @slave_system_rows_updated
@@ -150,11 +148,11 @@ select @system_rows_updated - @slave_system_rows_updated;
 select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted';
 select @system_rows_deleted - @slave_system_rows_deleted;
 @system_rows_deleted - @slave_system_rows_deleted
-4
+0
 select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted';
 select @system_rows_inserted - @slave_system_rows_inserted;
 @system_rows_inserted - @slave_system_rows_inserted
-4
+0
 DELETE FROM t1 WHERE i=2;
 ==========MASTER==========
 select variable_value into @rows_read from information_schema.global_status where variable_name = 'innodb_rows_read';
@@ -209,7 +207,7 @@ select @rows_inserted - @slave_rows_inserted;
 select variable_value into @system_rows_read from information_schema.global_status where variable_name = 'innodb_system_rows_read';
 select @system_rows_read - @slave_system_rows_read;
 @system_rows_read - @slave_system_rows_read
-5
+0
 select variable_value into @system_rows_updated from information_schema.global_status where variable_name = 'innodb_system_rows_updated';
 select @system_rows_updated - @slave_system_rows_updated;
 @system_rows_updated - @slave_system_rows_updated
@@ -217,11 +215,11 @@ select @system_rows_updated - @slave_system_rows_updated;
 select variable_value into @system_rows_deleted from information_schema.global_status where variable_name = 'innodb_system_rows_deleted';
 select @system_rows_deleted - @slave_system_rows_deleted;
 @system_rows_deleted - @slave_system_rows_deleted
-5
+0
 select variable_value into @system_rows_inserted from information_schema.global_status where variable_name = 'innodb_system_rows_inserted';
 select @system_rows_inserted - @slave_system_rows_inserted;
 @system_rows_inserted - @slave_system_rows_inserted
-5
+0
 DROP TABLE t1;
 DROP DATABASE testdb;
 include/rpl_end.inc

mysql-test/suite/rpl/t/rpl_innodb_bug68220.test

 --source include/have_innodb.inc
 --source include/master-slave.inc
+--source include/have_binlog_format_row.inc
 
 #
 # Bug#68220: innodb_rows_updated is misleading on slave when *info_repository=TABLE
 #
 
-# clean previous tests
---connection master
---disable_warnings
-DROP TABLE IF EXISTS testdb.t1;
-DROP DATABASE IF EXISTS testdb;
---enable_warnings
---sync_slave_with_master
-
 # created all the base variables at the beginning at the test
 --connection master
 select variable_value into @master_rows_read from information_schema.global_status where variable_name = 'innodb_rows_read';
@@ -45,6 +38,7 @@ INSERT INTO testdb.t1 VALUES (1);
 
 # update the row and show counters on master and slave
 UPDATE t1 SET i=2 WHERE i=1;
+--sync_slave_with_master
 --source suite/rpl/include/rpl_innodb_rows_counters.inc
 
 # delete the row and show counters on master and slave