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 /storage/myisam/mi_open.c | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'storage/myisam/mi_open.c')
| -rw-r--r-- | storage/myisam/mi_open.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index 4d3c227dcc3..cca2afa0b03 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -310,7 +310,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) /* Add space for node pointer */ share->base.max_key_length+= share->base.key_reflength; - if (!my_multi_malloc(MY_WME, + if (!my_multi_malloc(mi_key_memory_MYISAM_SHARE, MYF(MY_WME), &share,sizeof(*share), &share->state.rec_per_key_part, sizeof(long)*base_key_parts, @@ -599,7 +599,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) } /* alloc and set up private structure parts */ - if (!my_multi_malloc(MY_WME, + if (!my_multi_malloc(mi_key_memory_MI_INFO, MYF(MY_WME), &m_info,sizeof(MI_INFO), &info.blobs,sizeof(MI_BLOB)*share->base.blobs, &info.buff,(share->base.max_key_block_length*2+ @@ -759,7 +759,8 @@ uchar *mi_alloc_rec_buff(MI_INFO *info, ulong length, uchar **buf) MI_REC_BUFF_OFFSET : 0); if (extra && newptr) newptr-= MI_REC_BUFF_OFFSET; - if (!(newptr=(uchar*) my_realloc((uchar*)newptr, length+extra+8, + if (!(newptr=(uchar*) my_realloc(mi_key_memory_record_buffer, + (uchar*)newptr, length + extra + 8, MYF(MY_ALLOW_ZERO_PTR)))) return NULL; *((uint32 *) newptr)= (uint32) length; @@ -1004,7 +1005,7 @@ uchar *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state) if (!state->rec_per_key_part) { - if (!my_multi_malloc(MY_WME, + if (!my_multi_malloc(mi_key_memory_MYISAM_SHARE, MYF(MY_WME), &state->rec_per_key_part,sizeof(long)*key_parts, &state->key_root, keys*sizeof(my_off_t), &state->key_del, key_blocks*sizeof(my_off_t), |