diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-10 18:28:41 +0300 |
| commit | f47e003e1bfc56c2bf5d0f144a35517f526b538b (patch) | |
| tree | e2bfb9834c6e558381465ed2f57a9d873a9b2c90 /mysys/my_static.c | |
| parent | 51a92bbb03cc58ab8688fa9d8226afe32e6156ca (diff) | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| download | mariadb-git-f47e003e1bfc56c2bf5d0f144a35517f526b538b.tar.gz | |
Merged 5.1 with maria 5.1
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index a82c9bf518c..04bda8d2dcc 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -70,8 +70,8 @@ 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 */ -ulong sf_malloc_cur_memory= 0L; /* Current memory usage */ -ulong sf_malloc_max_memory= 0L; /* Maximum memory usage */ +size_t sf_malloc_cur_memory= 0L; /* Current memory usage */ +size_t sf_malloc_max_memory= 0L; /* Maximum memory usage */ uint sf_malloc_count= 0; /* Number of times NEW() was called */ uchar *sf_min_adress= (uchar*) ~(unsigned long) 0L, *sf_max_adress= (uchar*) 0L; |