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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-11-21 09:18:31 +02:00
parent cd04673a17 9b7a1c0e92
commit 0ead203111
6 changed files with 57 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/item_jsonfunc.h
View File

@@ -669,6 +669,7 @@ public:
static LEX_CSTRING name= {STRING_WITH_LEN("json_arrayagg(") };
return name;
}
bool fix_fields(THD *thd, Item **ref) override;
enum Sumfunctype sum_func() const override { return JSON_ARRAYAGG_FUNC; }
String* val_str(String *str) override;