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.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-10 21:38:55 +03:00
parent 17be2b47ba eae968f62d
commit 1c58748196
64 changed files with 1622 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_type.h
View File

@ -6145,8 +6145,11 @@ public:
const char *name,
Type_handler_hybrid_field_type *,
Type_all_attributes *atrr,
Item **items, uint nitems)
const override;
Item **items, uint nitems) const
override;
bool Item_func_min_max_fix_attributes(THD *thd, Item_func_min_max *func,
Item **items, uint nitems) const
override;
void Item_param_set_param_func(Item_param *param,
uchar **pos, ulong len) const override;
};