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/derror.cc | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'sql/derror.cc')
| -rw-r--r-- | sql/derror.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 7a79833c26c..1c10bdfdd92 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -120,8 +120,9 @@ bool init_errmessage(void) all_errors+= errors_per_range[i]; if (!(original_error_messages= (const char***) - my_malloc((all_errors + MAX_ERROR_RANGES)* sizeof(void*), - MYF(MY_ZEROFILL)))) + my_malloc(PSI_NOT_INSTRUMENTED, + (all_errors + MAX_ERROR_RANGES)*sizeof(void*), + MYF(MY_ZEROFILL)))) DBUG_RETURN(TRUE); errmsgs= (const char**)(original_error_messages + MAX_ERROR_RANGES); @@ -315,7 +316,8 @@ bool read_texts(const char *file_name, const char *language, DBUG_RETURN(1); if (!(*data= (const char***) - my_malloc((size_t) ((MAX_ERROR_RANGES+1) * sizeof(char**) + + my_malloc(key_memory_errmsgs, + (size_t) ((MAX_ERROR_RANGES+1) * sizeof(char**) + MY_MAX(msg_file.text_length, msg_file.errors * 2)+ msg_file.errors * sizeof(char*)), MYF(MY_WME)))) |