diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 13:58:03 +0200 |
| commit | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (patch) | |
| tree | 0d1b90c00ead9bf4e429168d00c0ccb123d1e887 /mysys/my_malloc.c | |
| parent | 8356fb68c366b7f515f9060d964ee598653756a6 (diff) | |
| parent | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (diff) | |
| download | mariadb-git-ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysys/my_malloc.c')
| -rw-r--r-- | mysys/my_malloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |