diff options
Diffstat (limited to 'storage/spider/spd_malloc.cc')
| -rw-r--r-- | storage/spider/spd_malloc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/spider/spd_malloc.cc b/storage/spider/spd_malloc.cc index 40b37ff4377..a9438f2ac58 100644 --- a/storage/spider/spd_malloc.cc +++ b/storage/spider/spd_malloc.cc @@ -203,7 +203,7 @@ void *spider_alloc_mem( uchar *ptr; DBUG_ENTER("spider_alloc_mem"); size += ALIGN_SIZE(sizeof(uint)) + ALIGN_SIZE(sizeof(uint)); - if (!(ptr = (uchar *) my_malloc(size, my_flags))) + if (!(ptr = (uchar *) my_malloc(PSI_INSTRUMENT_ME, size, my_flags))) DBUG_RETURN(NULL); spider_alloc_mem_calc(trx, id, func_name, file_name, line_no, size); @@ -233,7 +233,7 @@ void *spider_bulk_alloc_mem( total_size += ALIGN_SIZE(va_arg(args, uint)); va_end(args); - if (!(top_ptr = (uchar *) my_malloc(total_size, my_flags))) + if (!(top_ptr = (uchar *) my_malloc(PSI_INSTRUMENT_ME, total_size, my_flags))) DBUG_RETURN(NULL); spider_alloc_mem_calc(trx, id, func_name, file_name, line_no, total_size); @@ -476,9 +476,10 @@ char *spider_string::c_ptr_safe() LEX_STRING spider_string::lex_string() const { + LEX_STRING res= { (char*) str.ptr(), str.length() }; DBUG_ENTER("spider_string::lex_string"); DBUG_PRINT("info",("spider this=%p", this)); - DBUG_RETURN(str.lex_string()); + DBUG_RETURN(res); } void spider_string::set( |