database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-02 20:20:50 +02:00
parent 691e964d23 61acb43689
commit 5ea5291d97
42 changed files with 639 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/gcol/t/innodb_virtual_basic.test
View File

@@ -1021,7 +1021,7 @@ CREATE TABLE `ibstd_16` (
) ENGINE=INNODB;
# Block when FK constraint on base column of stored column.
#--error ER_CANNOT_ADD_FOREIGN
--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
CREATE TABLE `ibstd_16_fk` (
`a` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,
@@ -1040,7 +1040,6 @@ CREATE TABLE `ibstd_16_fk` (
KEY `vbidxcol_2` (`vbidxcol`,`d`),
CONSTRAINT `fk_16` FOREIGN KEY (`a`) REFERENCES `ibstd_16` (`a`) ON DELETE SET NULL
) ENGINE=InnoDB;
DROP TABLE ibstd_16_fk;
# Take out "KEY `a_2` (`a`,`vbidxcol`)", this should then be successful
CREATE TABLE `ibstd_16_fk` (