← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/mem0mem.ic

  • Committer: Brian Aker
  • Date: 2010-10-15 00:59:36 UTC
  • mfrom: (1849 staging)
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101015005936-znhvkz8khs4fhlyv
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/mem0mem.ic
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
581
581
/*==============*/
582
582
        mem_heap_t*     heap)   /*!< in: heap */
583
583
{
 
584
        mem_block_t*    block;
584
585
        ulint           size    = 0;
585
586
 
586
587
        ut_ad(mem_heap_check(heap));
587
588
 
588
 
        size = heap->total_size;
589
 
 
 
589
        block = heap;
 
590
 
 
591
        while (block != NULL) {
 
592
 
 
593
                size += mem_block_get_len(block);
 
594
                block = UT_LIST_GET_NEXT(list, block);
 
595
        }
590
596
#ifndef UNIV_HOTBACKUP
591
597
        if (heap->free_block) {
592
598
                size += UNIV_PAGE_SIZE;