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

Merge branch 10.5 into 10.6

Browse Source
This commit is contained in:
Daniel Black
2022-03-18 11:33:07 +11:00
parent ee80c19633 06e3bc4390
commit 065f995e6d
28 changed files with 404 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/unireg.h
View File

@@ -192,6 +192,22 @@ enum extra2_index_flags {
EXTRA2_IGNORED_KEY
};
static inline size_t extra2_read_len(const uchar **extra2, const uchar *end)
{
size_t length= *(*extra2)++;
if (length)
return length;
if ((*extra2) + 2 >= end)
return 0;
length= uint2korr(*extra2);
(*extra2)+= 2;
if (length < 256 || *extra2 + length > end)
return 0;
return length;
}
LEX_CUSTRING build_frm_image(THD *thd, const LEX_CSTRING &table,
HA_CREATE_INFO *create_info,
List<Create_field> &create_fields,