VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-21 23:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '11.4' into 11.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-05 17:50:18 +02:00
parent 06a7352d33 5ab81ffe00
commit ea75a0b600
508 changed files with 12703 additions and 5123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/type_uuid/item_uuidfunc.h
View File

@ -45,7 +45,7 @@ public:
{
return mark_unsupported_function(func_name(), "()", arg, VCOL_NON_DETERMINISTIC);
}
Item *get_copy(THD *thd) override
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_func_sys_guid>(thd, this); }
};
@ -74,7 +74,7 @@ public:
DBUG_ASSERT(fixed());
return UUIDv1::construct_native(to);
}
Item *get_copy(THD *thd) override
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_func_uuid>(thd, this); }
};