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 /sql/sql_profile.cc | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index cee55761a98..2a47aa846eb 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -200,7 +200,8 @@ void PROF_MEASUREMENT::set_label(const char *status_arg, sizes[1]= (function_arg == NULL) ? 0 : strlen(function_arg) + 1; sizes[2]= (file_arg == NULL) ? 0 : strlen(file_arg) + 1; - allocated_status_memory= (char *) my_malloc(sizes[0] + sizes[1] + sizes[2], MYF(0)); + allocated_status_memory= (char *) my_malloc(key_memory_PROFILE, sizes[0] + + sizes[1] + sizes[2], MYF(0)); DBUG_ASSERT(allocated_status_memory != NULL); cursor= allocated_status_memory; @@ -289,7 +290,7 @@ void QUERY_PROFILE::set_query_source(char *query_source_arg, size_t query_length DBUG_ASSERT(query_source == NULL); /* we don't leak memory */ if (query_source_arg != NULL) - query_source= my_strndup(query_source_arg, length, MYF(0)); + query_source= my_strndup(key_memory_PROFILE, query_source_arg, length, MYF(0)); } void QUERY_PROFILE::new_status(const char *status_arg, |