database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-14 10:26:22 +02:00
parent 7cad2e94b1 89e3815b39
commit 291872ec82
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/create_or_replace.result
View File

@ -576,4 +576,7 @@ CREATE TABLE tm (a INT) ENGINE=MERGE UNION(t);
CREATE OR REPLACE TABLE t LIKE tm; 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 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; DROP TABLE IF EXISTS tm, t;
#
# End of 10.3 tests
#
# End of 10.4 tests # End of 10.4 tests

4
mysql-test/main/create_or_replace.test
View File

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

1
mysql-test/main/kill.test
View File

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

1
mysql-test/main/partition_explicit_prune.test
View File

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