Merge branch 'mdev8294' into 10.1

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

@@ -11,6 +11,12 @@ insert into t1 values(1);
 sync_slave_with_master; 
 show global status like 'com_insert';
 stop slave;
+# Temporary work-around for bug MDEV-8301. There is a small window during
+# thread exit where the local status values of a thread are counted twice
+# in the global status. Remove this wait_condition.inc once MDEV-8301 is
+# fixed.
+--let $wait_condition= SELECT variable_value=1 FROM information_schema.global_status WHERE variable_name="Com_insert";
+--source include/wait_condition.inc
 show global status like 'com_insert';
 --source include/wait_for_slave_to_stop.inc
 start slave;