~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (C) 1994, 2010, 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
232
232
with mem_free.
233
233
@return own: free storage */
234
234
UNIV_INLINE
235
 
void*
 
235
void *
236
236
mem_alloc_func(
237
237
/*===========*/
238
238
        ulint           n,              /*!< in: requested size in bytes */
359
359
                        to the heap is also the first block in this list,
360
360
                        though it also contains the base node of the list. */
361
361
        ulint   len;    /*!< physical length of this block in bytes */
362
 
        ulint   total_size; /* physical length in bytes of all blocks
 
362
        ulint   total_size; /*!< physical length in bytes of all blocks
363
363
                        in the heap. This is defined only in the base
364
364
                        node and is set to ULINT_UNDEFINED in others. */
365
365
        ulint   type;   /*!< type of heap: MEM_HEAP_DYNAMIC, or