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

Merge 10.11 into 11.4

This commit is contained in:
Marko Mäkelä
2024-12-02 11:35:34 +02:00
420 changed files with 6452 additions and 4162 deletions

View File

@@ -104,12 +104,11 @@ static const char *init_syms(udf_func *tmp, char *nm)
}
extern "C" uchar* get_hash_key(const uchar *buff, size_t *length,
my_bool not_used __attribute__((unused)))
extern "C" const uchar *get_hash_key(const void *buff, size_t *length, my_bool)
{
udf_func *udf=(udf_func*) buff;
*length=(uint) udf->name.length;
return (uchar*) udf->name.str;
auto udf= static_cast<const udf_func *>(buff);
*length= udf->name.length;
return reinterpret_cast<const uchar *>(udf->name.str);
}
static PSI_memory_key key_memory_udf_mem;