diff options
| author | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
| commit | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch) | |
| tree | 3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /mysys/my_static.c | |
| parent | 1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff) | |
| parent | 6e7a509d06824447e427dd44d5692489267d9c4b (diff) | |
| download | mariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz | |
Merge with 4.0.14
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index bbf7582a454..b24ef28b7b1 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -69,14 +69,13 @@ uint sf_malloc_prehunc=0, /* If you have problem with core- */ sf_malloc_endhunc=0, /* dump when malloc-message.... */ /* set theese to 64 or 128 */ sf_malloc_quick=0; /* set if no calls to sanity */ -long lCurMemory = 0L; /* Current memory usage */ -long lMaxMemory = 0L; /* Maximum memory usage */ -uint cNewCount = 0; /* Number of times NEW() was called */ +ulong sf_malloc_cur_memory= 0L; /* Current memory usage */ +ulong sf_malloc_max_memory= 0L; /* Maximum memory usage */ +uint sf_malloc_count= 0; /* Number of times NEW() was called */ byte *sf_min_adress= (byte*) ~(unsigned long) 0L, *sf_max_adress= (byte*) 0L; - -/* Root of the linked list of remembers */ -struct remember *pRememberRoot = NULL; +/* Root of the linked list of struct st_irem */ +struct st_irem *sf_malloc_root = NULL; /* from my_alarm */ int volatile my_have_got_alarm=0; /* declare variable to reset */ |