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.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-12-25 09:13:28 +01:00
parent 0aa02567dd 043bd85a57
commit 478b83032b
112 changed files with 1838 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_type.h
View File

@ -3655,8 +3655,6 @@ public:
const Type_std_attributes *item,
SORT_FIELD_ATTR *attr) const= 0;
virtual bool is_packable() const { return false; }
virtual uint32 max_display_length(const Item *item) const= 0;
virtual uint32 Item_decimal_notation_int_digits(const Item *item) const { return 0; }
virtual uint32 calc_pack_length(uint32 length) const= 0;
@ -4816,8 +4814,6 @@ public:
const Type_std_attributes *item,
SORT_FIELD_ATTR *attr) const;
bool is_packable()const { return true; }
bool union_element_finalize(const Item * item) const;
bool Column_definition_prepare_stage1(THD *thd,