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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-20 16:53:20 +03:00
parent 5d9d379329 0792aff161
commit 44fd2c4b24
1152 changed files with 30607 additions and 29546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/gcol/r/innodb_virtual_debug.result
View File

@@ -46,7 +46,7 @@ t CREATE TABLE `t` (
`c` int(11) GENERATED ALWAYS AS (`a` + `b`) VIRTUAL,
`h` varchar(10) DEFAULT NULL,
KEY `idx` (`c`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SELECT * FROM t;
a b c h
0 3 3 mm
@@ -85,7 +85,7 @@ t CREATE TABLE `t` (
`c` int(11) GENERATED ALWAYS AS (`a` + `b`) VIRTUAL,
`h` varchar(10) DEFAULT NULL,
KEY `idx_1` (`c`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SELECT c FROM t;
c
NULL