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

Merge 10.2 (up to commit ef00ac4c86) into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2019-09-04 09:55:59 +04:00
parent a071e0e029 ef00ac4c86
commit 7e08ac0b41
44 changed files with 1825 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ c10 time GENERATED ALWAYS AS(addtime(c7,c8)) VIRTUAL,
c11 DATE GENERATED ALWAYS AS(addtime(c9,c8)) VIRTUAL,
c11a time GENERATED ALWAYS AS(addtime(c7,c10)) VIRTUAL,
c12 CHAR(1),
c13 CHAR(2)GENERATED ALWAYS AS (concat(c12,c12)) VIRTUAL,
c13 CHAR(2)GENERATED ALWAYS AS (concat(RTRIM(c12),RTRIM(c12))) VIRTUAL,
c14 CHAR(4)GENERATED ALWAYS AS (concat(c13,'x')) VIRTUAL,
PRIMARY KEY(c1),
KEY c13(c13),