summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-06-21 11:06:45 +0300
committerunknown <marko@hundin.mysql.fi>2004-06-21 11:06:45 +0300
commit38d5f83c04a549903950baef8ef972ca768db4da (patch)
treeaf7c153cf5f02085a90ccc050a6d523e8217bc89 /innobase
parent03a342ede383225639ce8e746b52843315f603c4 (diff)
parentf46aab6f5264290510c2d19e810c93f224b2deb9 (diff)
downloadmariadb-git-38d5f83c04a549903950baef8ef972ca768db4da.tar.gz
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
Diffstat (limited to 'innobase')
-rw-r--r--innobase/mem/mem0dbg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/mem/mem0dbg.c b/innobase/mem/mem0dbg.c
index 0a56d8dbadf..5ce7bc9f47d 100644
--- a/innobase/mem/mem0dbg.c
+++ b/innobase/mem/mem0dbg.c
@@ -20,8 +20,9 @@ Protected by mem_hash_mutex above. */
static ulint mem_n_created_heaps = 0;
static ulint mem_n_allocations = 0;
static ulint mem_total_allocated_memory = 0;
-ulint mem_current_allocated_memory = 0;
+ulint mem_current_allocated_memory = 0;
static ulint mem_max_allocated_memory = 0;
+static ulint mem_last_print_info = 0;
/* Size of the hash table for memory management tracking */
#define MEM_HASH_SIZE 997