diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:54:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:54:17 +0200 |
| commit | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (patch) | |
| tree | cdb1897896edfa898f17bebcd9eb73f29a3e220e /mysys | |
| parent | 12a85c6caf595c685336455e416099b6a8020534 (diff) | |
| parent | 17858e03a7bfe7f154a7f8097d2473dbd1cb20f2 (diff) | |
| download | mariadb-git-56c9b0bca0576985c31f20b46dcb060a01e81a2b.tar.gz | |
Merge 10.5 into 10.6
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 32606cafb23..8eda279a492 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 abc11b42500..c86b0d92cb6 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 3e0b774b0c7..c3205eac6f0 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -34,8 +34,8 @@ 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 (It is external size of chunk i.e. it should include memory required for internal structures, thus it diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index befdcb0e5c3..c32831ed20d 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 |