← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mf_keycache.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/myisam/mf_keycache.c
326
326
          Allocate memory for blocks, hash_links and hash entries;
327
327
          For each block 2 hash links are allocated
328
328
        */
329
 
        if ((keycache->block_root= (BLOCK_LINK*) my_malloc(length,
330
 
                                                           MYF(0))))
 
329
        if ((keycache->block_root= (BLOCK_LINK*) malloc(length)))
331
330
          break;
332
331
        free(keycache->block_mem);
333
332
        keycache->block_mem= 0;
3210
3209
        changed blocks appear while we need to wait for something.
3211
3210
      */
3212
3211
      if ((count > FLUSH_CACHE) &&
3213
 
          !(cache= (BLOCK_LINK**) my_malloc(sizeof(BLOCK_LINK*)*count,
3214
 
                                            MYF(0))))
 
3212
          !(cache= (BLOCK_LINK**) malloc(sizeof(BLOCK_LINK*)*count)))
3215
3213
        cache= cache_buff;
3216
3214
      /*
3217
3215
        After a restart there could be more changed blocks than now.