← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_open.c

  • Committer: Monty Taylor
  • Date: 2008-12-07 22:57:38 UTC
  • mto: This revision was merged to the branch mainline in revision 670.
  • Revision ID: monty@inaugust.com-20081207225738-y20u8hgd4m4uq60h
Removed my_malloc stuff from storage/

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_open.c
30
30
{
31
31
  HP_INFO *info;
32
32
 
33
 
  if (!(info= (HP_INFO*) my_malloc((uint) sizeof(HP_INFO) +
34
 
                                  2 * share->max_key_length,
35
 
                                  MYF(MY_ZEROFILL))))
 
33
  if (!(info= (HP_INFO*) malloc(sizeof(HP_INFO) + 2 * share->max_key_length)))
36
34
  {
37
35
    return(0);
38
36
  }
 
37
  memset(info, 0, sizeof(HP_INFO) + 2 * share->max_key_length);
39
38
  share->open_count++;
40
39
  thr_lock_data_init(&share->lock,&info->lock,NULL);
41
40
  info->s= share;