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

MDEV-26221: DYNAMIC_ARRAY use size_t for sizes

Browse Source 
https://jira.mariadb.org/browse/MDEV-26221
my_sys DYNAMIC_ARRAY and DYNAMIC_STRING inconsistancy

The DYNAMIC_STRING uses size_t for sizes, but DYNAMIC_ARRAY used uint.
This patch adjusts DYNAMIC_ARRAY to use size_t like DYNAMIC_STRING.

As the MY_DIR member number_of_files is copied from a DYNAMIC_ARRAY,
this is changed to be size_t.

As MY_TMPDIR members 'cur' and 'max' are copied from a DYNAMIC_ARRAY,
these are also changed to be size_t.

The lists of plugins and stored procedures use DYNAMIC_ARRAY,
but their APIs assume a size of 'uint'; these are unchanged.
This commit is contained in:
Eric Herman
2021-09-03 06:38:54 +02:00
committed by Vicențiu-Marian Ciorbaru
parent 9ab0d07e10
commit 401ff6994d
46 changed files with 188 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
strings/json_normalize.c
View File

@@ -264,9 +264,9 @@ json_norm_array_append_value(struct json_norm_array *arr,
int
json_norm_init_dynamic_array(size_t element_size, void *where)
{
const uint init_alloc= 20;
const uint alloc_increment= 20;
return my_init_dynamic_array(PSI_JSON, where, (uint)element_size,
const size_t init_alloc= 20;
const size_t alloc_increment= 20;
return my_init_dynamic_array(PSI_JSON, where, element_size,
init_alloc, alloc_increment,
JSON_MALLOC_FLAGS);
}