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

Merge 10.6 into 10.10

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-23 18:43:36 +03:00
parent 057fd52876 b21f52ee73
commit 5a8fca5a4f
31 changed files with 1168 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_type.h
View File

@ -3268,10 +3268,16 @@ public:
bool agg_item_collations(DTCollation &c, const LEX_CSTRING &name,
Item **items, uint nitems,
uint flags, int item_sep);
struct Single_coll_err
{
const DTCollation& coll;
bool first;
};
bool agg_item_set_converter(const DTCollation &coll,
const LEX_CSTRING &name,
Item **args, uint nargs,
uint flags, int item_sep);
uint flags, int item_sep,
const Single_coll_err *single_item_err= NULL);
/*
Collect arguments' character sets together.