← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/heap/hp_clear.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_clear.c
31
31
  DBUG_ENTER("hp_clear");
32
32
 
33
33
  if (info->block.levels)
34
 
    VOID(hp_free_level(&info->block,info->block.levels,info->block.root,
35
 
                        (uchar*) 0));
 
34
    (void) hp_free_level(&info->block,info->block.levels,info->block.root,
 
35
                        (uchar*) 0);
36
36
  info->block.levels=0;
37
37
  hp_clear_keys(info);
38
38
  info->records= info->deleted= 0;
94
94
    {
95
95
      HP_BLOCK *block= &keyinfo->block;
96
96
      if (block->levels)
97
 
        VOID(hp_free_level(block,block->levels,block->root,(uchar*) 0));
 
97
        (void) hp_free_level(block,block->levels,block->root,(uchar*) 0);
98
98
      block->levels=0;
99
99
      block->last_allocated=0;
100
100
      keyinfo->hash_buckets= 0;