Merge branch '10.3' into 10.4

MariaDB · Oct 14, 2022 · 291872e · 291872e
2 parents 7cad2e9 + 89e3815
commit 291872e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result
@@ -576,4 +576,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
diff --git a/mysql-test/main/create_or_replace.test b/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
diff --git a/mysql-test/main/kill.test b/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/not_threadpool.inc

diff --git a/mysql-test/main/partition_explicit_prune.test b/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 #