Merge branch 'mysql-8.0' into mysql-trunk

Author: dahlerlend

mysql-test/suite/group_replication/r/gr_blocked_start_gr_killed.result

@@ -10,7 +10,7 @@ Note	####	Storing MySQL user name or password information in the master info rep
 [connection server1]
 SET sql_log_bin=0;
 CALL mtr.add_suppression("Error writing file.*(errno: 28 - No space left on device)");
-CALL mtr.add_suppression("Disk is full writing.*(Errcode: 28 - No space left on device)");
+CALL mtr.add_suppression("Disk is full writing.*(OS errno 28 - No space left on device)");
 CALL mtr.add_suppression("Retry in 60 secs. Message reprinted in 600 secs");
 CALL mtr.add_suppression("Unblocking the group replication thread waiting for applier to start, as the start group replication was killed");
 CALL mtr.add_suppression("Unable to initialize the Group Replication applier module.");

mysql-test/suite/group_replication/t/gr_blocked_start_gr_killed.test

@@ -34,7 +34,7 @@
 # Suppression of error messages
 SET sql_log_bin=0;
 CALL mtr.add_suppression("Error writing file.*(errno: 28 - No space left on device)");
-CALL mtr.add_suppression("Disk is full writing.*(Errcode: 28 - No space left on device)");
+CALL mtr.add_suppression("Disk is full writing.*(OS errno 28 - No space left on device)");
 CALL mtr.add_suppression("Retry in 60 secs. Message reprinted in 600 secs");
 CALL mtr.add_suppression("Unblocking the group replication thread waiting for applier to start, as the start group replication was killed");
 CALL mtr.add_suppression("Unable to initialize the Group Replication applier module.");

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

@@ -7,6 +7,7 @@
 
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
+--source include/have_transaction_write_set_extraction.inc
 --source include/master-slave.inc
 
 --let $assert_text= The value for transaction_write_set_extraction must be XXHASH64