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 remote-tracking branch 'origin/11.4' into 11.5

Browse Source
This commit is contained in:
Alexander Barkov
2024-07-08 11:36:59 +04:00
parent 6e4f95a086 14d9801cd3
commit 8f4ec79d09
250 changed files with 4031 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_plugin.cc
View File

@ -379,9 +379,10 @@ static void fix_dl_name(MEM_ROOT *root, LEX_CSTRING *dl)
!so_ext.streq(Lex_cstring(dl->str + dl->length - so_ext.length,
so_ext.length)))
{
char *s= (char*)alloc_root(root, dl->length + so_ext.length + 1);
size_t s_size= dl->length + so_ext.length + 1;
char *s= (char*)alloc_root(root, s_size);
memcpy(s, dl->str, dl->length);
strcpy(s + dl->length, SO_EXT);
safe_strcpy(s + dl->length, s_size - dl->length, SO_EXT);
dl->str= s;
dl->length+= so_ext.length;
}
@ -3850,7 +3851,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
DBUG_ENTER("construct_options");
plugin_name_ptr= (char*) alloc_root(mem_root, plugin_name_len + 1);
strcpy(plugin_name_ptr, plugin_name);
safe_strcpy(plugin_name_ptr, plugin_name_len + 1, plugin_name);
my_casedn_str_latin1(plugin_name_ptr); // Plugin names are pure ASCII
convert_underscore_to_dash(plugin_name_ptr, plugin_name_len);
plugin_name_with_prefix_ptr= (char*) alloc_root(mem_root,