diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-14 10:26:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-14 10:26:22 +0200 |
| commit | 291872ec82fc2a19aedf8dcf13838ecd34101caa (patch) | |
| tree | 81671a1ac792fc8dead217afa107488f759fd2b6 | |
| parent | 7cad2e94b1664a2185b873bc6f801b98fcefa817 (diff) | |
| parent | 89e3815b395e29a0e2c282a08ed6326a3330a2aa (diff) | |
| download | mariadb-git-291872ec82fc2a19aedf8dcf13838ecd34101caa.tar.gz | |
Merge branch '10.3' into 10.4
| -rw-r--r-- | mysql-test/main/create_or_replace.result | 3 | ||||
| -rw-r--r-- | mysql-test/main/create_or_replace.test | 4 | ||||
| -rw-r--r-- | mysql-test/main/kill.test | 1 | ||||
| -rw-r--r-- | mysql-test/main/partition_explicit_prune.test | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/main/create_or_replace.result b/mysql-test/main/create_or_replace.result index 9a99e42ce74..701b8a8c6d3 100644 --- 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 index 11c4dfca914..b4bfcab50db 100644 --- 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 index 4fcf43ce1b0..ccc2a93b0a4 100644 --- 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 index be590e3d2a5..9d9b7e782ce 100644 --- 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 # |