diff options
Diffstat (limited to 'storage/maria/ma_create.c')
| -rw-r--r-- | storage/maria/ma_create.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 06139ed564d..a13190b0220 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -145,7 +145,8 @@ int maria_create(const char *name, enum data_file_type datafile_type, } if (!(rec_per_key_part= - (double*) my_malloc((keys + uniques)*HA_MAX_KEY_SEG*sizeof(double) + + (double*) my_malloc(PSI_INSTRUMENT_ME, + (keys + uniques)*HA_MAX_KEY_SEG*sizeof(double) + (keys + uniques)*HA_MAX_KEY_SEG*sizeof(ulong) + sizeof(uint16) * columns, MYF(MY_WME | MY_ZEROFILL)))) @@ -1028,7 +1029,8 @@ int maria_create(const char *name, enum data_file_type datafile_type, { /* Store columns in a more efficent order */ MARIA_COLUMNDEF **col_order, **pos; - if (!(col_order= (MARIA_COLUMNDEF**) my_malloc(share.base.fields * + if (!(col_order= (MARIA_COLUMNDEF**) my_malloc(PSI_INSTRUMENT_ME, + share.base.fields * sizeof(MARIA_COLUMNDEF*), MYF(MY_WME)))) goto err; @@ -1090,7 +1092,8 @@ int maria_create(const char *name, enum data_file_type datafile_type, log_array[TRANSLOG_INTERNAL_PARTS + 1].length= 1 + 2 + 2 + (uint) kfile_size_before_extension; /* we are needing maybe 64 kB, so don't use the stack */ - log_data= my_malloc(log_array[TRANSLOG_INTERNAL_PARTS + 1].length, MYF(0)); + log_data= my_malloc(PSI_INSTRUMENT_ME, + log_array[TRANSLOG_INTERNAL_PARTS + 1].length, MYF(0)); if ((log_data == NULL) || mysql_file_pread(file, 1 + 2 + 2 + log_data, (size_t) kfile_size_before_extension, 0, MYF(MY_NABP))) |