Merge branch 'mysql-8.0' into mysql-8.4

Change-Id: I0a05ee99f6281658bf053d247775abb7647dbdf2

Author: Lukasz Gniadzik

mysql-test/suite/rpl_nogtid/t/rpl_server_uuid.test

@@ -269,7 +269,7 @@ eval CHANGE REPLICATION SOURCE TO
 # Grep only after the message that the server_2 has connected to the master
 --let $assert_only_after=Start binlog_dump to source_thread_id\($replica_thread_id\)
 --let $assert_count= 1
---let $assert_select=found a zombie dump thread with the same UUID
+--let $assert_select=Upon reconnection with the replica, while initializing the dump thread for.*, an existing dump thread with the same.* was detected.*
 --let $assert_text= Found the expected line in master's error log for server 2 disconnection
 --source include/assert_grep.inc