diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-08-04 10:39:53 +0200 |
| commit | 3f1c763a94cd25c4810692983f6e61b528e21268 (patch) | |
| tree | d8f9632933303f9bdf8cdc875613ca99f51ecbcb /storage/xtradb/include/mem0mem.h | |
| parent | a74d04671d23fa65bd610184965cc2974ec41cf9 (diff) | |
| parent | 0c6afe17dceb926b5c757157308188e540caec1e (diff) | |
| download | mariadb-git-3f1c763a94cd25c4810692983f6e61b528e21268.tar.gz | |
Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/mem0mem.h')
| -rw-r--r-- | storage/xtradb/include/mem0mem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/xtradb/include/mem0mem.h b/storage/xtradb/include/mem0mem.h index 98f8748e529..ee28cf7b225 100644 --- a/storage/xtradb/include/mem0mem.h +++ b/storage/xtradb/include/mem0mem.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -359,6 +359,9 @@ struct mem_block_info_struct { to the heap is also the first block in this list, though it also contains the base node of the list. */ ulint len; /*!< physical length of this block in bytes */ + ulint total_size; /* physical length in bytes of all blocks + in the heap. This is defined only in the base + node and is set to ULINT_UNDEFINED in others. */ ulint type; /*!< type of heap: MEM_HEAP_DYNAMIC, or MEM_HEAP_BUF possibly ORed to MEM_HEAP_BTR_SEARCH */ ulint free; /*!< offset in bytes of the first free position for |