database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-19 15:38:53 +02:00
parent c391fb1ff1 c982a143fc
commit a54d151fc1
129 changed files with 1398 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/array.c
View File

@@ -251,7 +251,7 @@ my_bool allocate_dynamic(DYNAMIC_ARRAY *array, size_t max_elements)
if (!(new_ptr= (uchar *) my_malloc(array->m_psi_key, size *
array->size_of_element,
MYF(array->malloc_flags | MY_WME))))
DBUG_RETURN(0);
DBUG_RETURN(TRUE);
memcpy(new_ptr, array->buffer,
array->elements * array->size_of_element);
array->malloc_flags&= ~MY_INIT_BUFFER_USED;