← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mf_keycache.c

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mf_keycache.c
353
353
    keycache->hash_link_root= (HASH_LINK*) ((char*) keycache->hash_root +
354
354
                                            ALIGN_SIZE((sizeof(HASH_LINK*) *
355
355
                                                        keycache->hash_entries)));
356
 
    memset((uchar*) keycache->block_root, 0,
 
356
    memset(keycache->block_root, 0,
357
357
           keycache->disk_blocks * sizeof(BLOCK_LINK));
358
 
    memset((uchar*) keycache->hash_root, 0,
 
358
    memset(keycache->hash_root, 0,
359
359
           keycache->hash_entries * sizeof(HASH_LINK*));
360
 
    memset((uchar*) keycache->hash_link_root, 0,
 
360
    memset(keycache->hash_link_root, 0,
361
361
           keycache->hash_links * sizeof(HASH_LINK));
362
362
    keycache->hash_links_used= 0;
363
363
    keycache->free_hash_list= NULL;
383
383
 
384
384
    keycache->waiting_for_hash_link.last_thread= NULL;
385
385
    keycache->waiting_for_block.last_thread= NULL;
386
 
    memset((uchar*) keycache->changed_blocks, 0,
 
386
    memset(keycache->changed_blocks, 0,
387
387
           sizeof(keycache->changed_blocks[0]) * CHANGED_BLOCKS_HASH);
388
 
    memset((uchar*) keycache->file_blocks, 0,
 
388
    memset(keycache->file_blocks, 0,
389
389
           sizeof(keycache->file_blocks[0]) * CHANGED_BLOCKS_HASH);
390
390
  }
391
391
  else