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 '11.1' into 11.2

Browse Source
This commit is contained in:
Sergei Golubchik
2023-08-17 17:27:05 +02:00
parent 8aa1a9e6a7 9bc25d9820
commit 18ddde4826
879 changed files with 12425 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/gcol/r/innodb_virtual_basic.result
View File

@@ -1077,7 +1077,7 @@ KEY `a_2` (`a`,`vbidxcol`),
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;
ERROR HY000: Function or expression 'a' cannot be used in the GENERATED ALWAYS AS clause of `vadcol`
CREATE TABLE `ibstd_16_fk` (
`a` int(11) DEFAULT NULL,
`d` int(11) DEFAULT NULL,