diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:39:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:39:45 +0300 |
| commit | dd2836c4c153566420efcdbe68173b29adcb24e5 (patch) | |
| tree | 0be61ddbb8a76073cf672a53d8a43bbb00c751eb /mysys/my_static.c | |
| parent | 2a450f0c1e4e670f91875683b7761648496d9c63 (diff) | |
| download | mariadb-git-dd2836c4c153566420efcdbe68173b29adcb24e5.tar.gz | |
Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem)
include/my_sys.h:
Changed safe_malloc variables to start with sf_
mysys/default.c:
Use safemalloc (as we use dynamic_arrays() that uses it inderectly anyway)
mysys/my_static.c:
Changed safe_malloc variables to start with sf_
mysys/my_static.h:
Changed safe_malloc variables to start with sf_
Changed safemalloc structure to not have to be 8 byte aligned
mysys/safemalloc.c:
Changed safemalloc structure to not have to be 8 byte aligned. (portability fix)
BIG code cleanup
sql/mysqld.cc:
Changed safe_malloc variables to start with sf_
sql/sql_parse.cc:
Changed safe_malloc variables to start with sf_
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 */ |