← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_block.c

merge with the latest code from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_block.c
76
76
    and my_default_record_cache_size we get about 1/128 unused memory.
77
77
   */
78
78
  *alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer;
79
 
  if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))
 
79
  if (!(root=(HP_PTRS*) malloc(*alloc_length)))
80
80
    return 1;
81
81
 
82
82
  if (i == 0)