mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.5' into 10.6

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-10-09 08:38:48 +02:00
commit 1d0e94c55f
45 changed files with 491 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sql/field.h
View file

@ -4593,6 +4593,7 @@ public:
return get_key_image_itRAW(ptr_arg, buff, length);
}
void set_key_image(const uchar *buff,uint length) override;
Field *make_new_field(MEM_ROOT *, TABLE *new_table, bool keep_type) override;
Field *new_key_field(MEM_ROOT *root, TABLE *new_table,
uchar *new_ptr, uint32 length,
uchar *new_null_ptr, uint new_null_bit) override;