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/mf_tempdir.c | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'mysys/mf_tempdir.c')
| -rw-r--r-- | mysys/mf_tempdir.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c index 39de3570fad..1883c5578f8 100644 --- a/mysys/mf_tempdir.c +++ b/mysys/mf_tempdir.c @@ -30,7 +30,8 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist) DBUG_PRINT("enter", ("pathlist: %s", pathlist ? pathlist : "NULL")); mysql_mutex_init(key_TMPDIR_mutex, &tmpdir->mutex, MY_MUTEX_INIT_FAST); - if (my_init_dynamic_array(&tmpdir->full_list, sizeof(char*), 1, 5, MYF(0))) + if (my_init_dynamic_array(&tmpdir->full_list, key_memory_MY_TMPDIR_full_list, + sizeof(char*), 1, 5, MYF(0))) goto err; if (!pathlist || !pathlist[0]) { @@ -51,7 +52,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist) end=strcend(pathlist, DELIM); strmake(buff, pathlist, (uint) (end-pathlist)); length= cleanup_dirname(buff, buff); - if (!(copy= my_strndup(buff, length, MYF(MY_WME))) || + if (!(copy= my_strndup(key_memory_MY_TMPDIR_full_list, buff, length, MYF(MY_WME))) || insert_dynamic(&tmpdir->full_list, (uchar*) ©)) DBUG_RETURN(TRUE); pathlist=end+1; |