← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysys/my_malloc.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_malloc.c
43
43
  }
44
44
  else if (my_flags & MY_ZEROFILL)
45
45
    bzero(point,size);
46
 
  DBUG_PRINT("exit",("ptr: 0x%lx", (long) point));
 
46
  DBUG_PRINT("exit",("ptr: %p", point));
47
47
  DBUG_RETURN((void*) point);
48
48
} /* my_malloc */
49
49
 
54
54
void my_no_flags_free(void* ptr)
55
55
{
56
56
  DBUG_ENTER("my_free");
57
 
  DBUG_PRINT("my",("ptr: 0x%lx", (long) ptr));
 
57
  DBUG_PRINT("my",("ptr: %p", ptr));
58
58
  if (ptr)
59
59
    free(ptr);
60
60
  DBUG_VOID_RETURN;