diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-01-29 13:50:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 7c58e97bf6f80a251046c5b3e7bce826fe058bd6 (patch) | |
| tree | 7d32d26b320cf83296ee0ede2ea164ad116c4de8 /mysys/queues.c | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'mysys/queues.c')
| -rw-r--r-- | mysys/queues.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/queues.c b/mysys/queues.c index 5d09ce2063f..aac70a4825d 100644 --- a/mysys/queues.c +++ b/mysys/queues.c @@ -76,7 +76,8 @@ int init_queue(QUEUE *queue, uint max_elements, uint offset_to_key, { DBUG_ENTER("init_queue"); - if ((queue->root= (uchar **) my_malloc((max_elements + 1) * sizeof(void*), + if ((queue->root= (uchar **) my_malloc(key_memory_QUEUE, + (max_elements + 1) * sizeof(void*), MYF(MY_WME))) == 0) DBUG_RETURN(1); queue->elements= 0; @@ -148,7 +149,7 @@ int resize_queue(QUEUE *queue, uint max_elements) DBUG_ENTER("resize_queue"); if (queue->max_elements == max_elements) DBUG_RETURN(0); - if ((new_root= (uchar **) my_realloc((void *)queue->root, + if ((new_root= (uchar **) my_realloc(key_memory_QUEUE, (void *)queue->root, (max_elements + 1)* sizeof(void*), MYF(MY_WME))) == 0) DBUG_RETURN(1); |