database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-10-12 12:14:13 +03:00
parent 15edd69ddf 977c385df3
commit a992c615a6
55 changed files with 3153 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,6 +508,18 @@ SELECT * FROM t3;
UNLOCK TABLES;
DROP TABLE t3;
--echo #
--echo # MDEV-29697 Assertion failure in Diagnostics_area::set_ok_status
--echo # upon CREATE OR REPLACE causing ER_UPDATE_TABLE_USED
--echo #
CREATE TABLE t (a INT) ENGINE=MyISAM;
CREATE TABLE tm (a INT) ENGINE=MERGE UNION(t);
--error ER_UPDATE_TABLE_USED
CREATE OR REPLACE TABLE t LIKE tm;
# Cleanup
DROP TABLE IF EXISTS tm, t;
--echo # End of 10.4 tests
SET GLOBAL innodb_stats_persistent=@save_persistent;