Merge branch 'mysql-8.0' into mysql-trunk

Author: dahlerlend

mysql-test/suite/innodb/t/trigger_function_lock_compare.test

@@ -75,4 +75,6 @@ while ($binlog_formats)
 # Cleanup
 DROP TABLE cases;
 SET GLOBAL BINLOG_FORMAT=@saved_binlog_format;
+# Remove this when Bug#33594199 has been fixed
+RESET MASTER;
 --enable_query_log