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 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-21 13:41:04 +03:00
parent 1388845e04 1a2308d3f4
commit e4a7c15dd6
70 changed files with 1947 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/item_jsonfunc.cc
View File

@ -3537,6 +3537,7 @@ const char *Item_func_json_format::func_name() const
bool Item_func_json_format::fix_length_and_dec()
{
decimals= 0;
collation.set(args[0]->collation);
max_length= args[0]->max_length;
maybe_null= 1;
return FALSE;