← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_create.c

merge with the latest code from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_create.c
251
251
          keyinfo->get_key_length= hp_rb_key_length;
252
252
      }
253
253
    }
254
 
    if (!(share= (HP_SHARE*) my_malloc((uint) sizeof(HP_SHARE)+
255
 
                                       keys*sizeof(HP_KEYDEF)+
256
 
                                       columns*sizeof(HP_COLUMNDEF)+
257
 
                                       key_segs*sizeof(HA_KEYSEG),
258
 
                                       MYF(MY_ZEROFILL))))
 
254
    if (!(share= (HP_SHARE*) malloc(sizeof(HP_SHARE)+
 
255
                                    keys*sizeof(HP_KEYDEF)+
 
256
                                    columns*sizeof(HP_COLUMNDEF)+
 
257
                                    key_segs*sizeof(HA_KEYSEG))))
259
258
      goto err;
 
259
    memset(share, 0, sizeof(HP_SHARE)+
 
260
                     keys*sizeof(HP_KEYDEF)+
 
261
                     columns*sizeof(HP_COLUMNDEF)+
 
262
                     key_segs*sizeof(HA_KEYSEG));
260
263
 
261
264
    /*
262
265
       Max_records is used for estimating block sizes and for enforcement.
339
342
    }
340
343
 
341
344
    /* Must be allocated separately for rename to work */
342
 
    if (!(share->name= my_strdup(name,MYF(0))))
 
345
    if (!(share->name= strdup(name)))
343
346
    {
344
347
      free((unsigned char*) share);
345
348
      goto err;