Merge branch '10.4' into 10.5

extra/wolfssl/wolfssl

@@ -1 +1 @@
-Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8
+Subproject commit f1e2165c591f074feb47872a8ff712713ec411e1

mysql-test/main/create_or_replace.result

@@ -575,4 +575,7 @@ CREATE TABLE tm (a INT) ENGINE=MERGE UNION(t);
 CREATE OR REPLACE TABLE t LIKE tm;
 ERROR HY000: Table 'tm' is specified twice, both as a target for 'CREATE' and as a separate source for data
 DROP TABLE IF EXISTS tm, t;
+#
+# End of 10.3 tests
+#
 # End of 10.4 tests

mysql-test/main/create_or_replace.test

@@ -523,4 +523,8 @@ CREATE OR REPLACE TABLE t LIKE tm;
 # Cleanup
 DROP TABLE IF EXISTS tm, t;
 
+--echo #
+--echo # End of 10.3 tests
+--echo #
+
 --echo # End of 10.4 tests

mysql-test/main/kill.test

@@ -7,6 +7,7 @@
 # application. 'mysqltest' does not handle the kill request.
 #
 
+-- source include/count_sessions.inc
 -- source include/not_embedded.inc
 -- source include/have_debug_sync.inc
 -- source include/have_debug_sync.inc

mysql-test/main/partition_explicit_prune.test

@@ -880,6 +880,7 @@ SELECT * FROM t1 PARTITION (p0);
 UNLOCK TABLES;
 DROP TABLE t1, t2;
 --enable_service_connection
+
 --echo #
 --echo # MDEV-18371 Server crashes in ha_innobase::cmp_ref upon UPDATE with PARTITION clause.
 --echo #