diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
commit | 4081b7b27a40df6244e0525885cf70e48b7b35bc (patch) | |
tree | e9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/suite/gcol/r/innodb_virtual_index.result | |
parent | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff) | |
parent | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff) | |
download | mariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/gcol/r/innodb_virtual_index.result')
-rw-r--r-- | mysql-test/suite/gcol/r/innodb_virtual_index.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_index.result b/mysql-test/suite/gcol/r/innodb_virtual_index.result index 6913ec698b4..3918cf95ae1 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_index.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_index.result @@ -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), |