← Back to branch summary

~thomir-deactivatedaccount/drizzle/drizzle-fix-bug653747

« back to all changes in this revision

Viewing changes to plugin/innobase/mem/mem0mem.c

  • Committer: Brian Aker
  • Date: 2010-10-10 02:07:52 UTC
  • mfrom: (1827.2.3 staging)
  • Revision ID: brian@tangent.org-20101010020752-ktv73isay5dxtvp3
Merge in switch on table_share_instance inheritance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mem/mem0mem.c
475
475
        len = block->len;
476
476
        block->magic_n = MEM_FREED_BLOCK_MAGIC_N;
477
477
 
478
 
#ifndef UNIV_HOTBACKUP
479
478
#ifdef UNIV_MEM_DEBUG
480
479
        /* In the debug version we set the memory to a random combination
481
480
        of hex 0xDE and 0xAD. */
485
484
        UNIV_MEM_ASSERT_AND_FREE(block, len);
486
485
#endif /* UNIV_MEM_DEBUG */
487
486
 
 
487
#ifndef UNIV_HOTBACKUP
488
488
        if (type == MEM_HEAP_DYNAMIC || len < UNIV_PAGE_SIZE / 2) {
489
489
 
490
490
                ut_ad(!buf_block);
495
495
                buf_block_free(buf_block);
496
496
        }
497
497
#else /* !UNIV_HOTBACKUP */
498
 
#ifdef UNIV_MEM_DEBUG
499
 
        /* In the debug version we set the memory to a random
500
 
        combination of hex 0xDE and 0xAD. */
501
 
 
502
 
        mem_erase_buf((byte*)block, len);
503
 
#else /* UNIV_MEM_DEBUG */
504
 
        UNIV_MEM_ASSERT_AND_FREE(block, len);
505
 
#endif /* UNIV_MEM_DEBUG */
506
498
        ut_free(block);
507
499
#endif /* !UNIV_HOTBACKUP */
508
500
}