diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 15:06:25 +0200 |
| commit | cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb (patch) | |
| tree | 8d4f7cd1c17be55f899e20a20f4b4f0b86a5fd53 /mysys | |
| parent | 66f7f7998ceae4b6274c5e84738b2c0c8dfa3064 (diff) | |
| parent | 820ebcec8651d2478ece554f059a5513f0b2bedf (diff) | |
| download | mariadb-git-cae5a0328bd70fa1bc877fc35fecc704fdb6f6cb.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/array.c | 1 | ||||
| -rw-r--r-- | mysys/hash.c | 3 | ||||
| -rw-r--r-- | mysys/my_alloc.c | 2 | ||||
| -rw-r--r-- | mysys/my_malloc.c | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/mysys/array.c b/mysys/array.c index aa2f444653f..6e871ee6343 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -23,6 +23,7 @@ SYNOPSIS init_dynamic_array2() + ps_key Key to register instrumented memory array Pointer to an array element_size Size of element init_buffer Initial buffer pointer diff --git a/mysys/hash.c b/mysys/hash.c index d9132b28cd7..fccd4a24373 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -60,8 +60,9 @@ my_hash_value_type my_hash_sort(CHARSET_INFO *cs, const uchar *key, dynamic array that is part of the hash will allocate memory as required during insertion. + @param[in] psi_key The key to register instrumented memory @param[in,out] hash The hash that is initialized - @param[in[ growth_size size incrememnt for the underlying dynarray + @param[in] growth_size size incrememnt for the underlying dynarray @param[in] charset The character set information @param[in] size The hash size @param[in] key_offest The key offset for the hash diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 9f230b6bbcb..a5b855f9604 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -120,8 +120,8 @@ static void calculate_block_sizes(MEM_ROOT *mem_root, size_t block_size, SYNOPSIS init_alloc_root() + key - key to register instrumented memory mem_root - memory root to initialize - name - name of memroot (for debugging) block_size - size of chunks (blocks) used for memory allocation. Will be updated to next power of 2, minus internal and system memory management size. This is diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index b2cbb84984d..b8f64de589e 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -59,6 +59,7 @@ void set_malloc_size_cb(MALLOC_SIZE_CB func) /** Allocate a sized block of memory. + @param key Key to register instrumented memory @param size The size of the memory block in bytes. @param flags Failure action modifiers (bitmasks). @@ -120,7 +121,8 @@ void *my_malloc(PSI_memory_key key, size_t size, myf my_flags) /** @brief wrapper around realloc() - @param old_point pointer to currently allocated area + @param key key to register instrumented memory + @param old_point pointer to currently allocated area @param size new size requested, must be >0 @param my_flags flags |