database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2024-03-13 19:49:05 +01:00
parent 0e8cda6130 4cda50afbd
commit f71d7f2f0f
47 changed files with 582 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/func_json.result
View File

@ -272,7 +272,7 @@ create table t1 as select json_object('id', 87, 'name', 'carrot') as f;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f` varchar(32) DEFAULT NULL
`f` varchar(46) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
f