summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysys/my_static.c4
-rw-r--r--mysys/my_static.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c
index cb482b19b57..d0c20da828a 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;
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 0eca196c1c9..90168b099a8 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -44,8 +44,8 @@ struct st_irem
struct st_irem *next; /* Linked list of structures */
struct st_irem *prev; /* Other link */
char *filename; /* File in which memory was new'ed */
+ size_t datasize; /* Size requested */
uint32 linenum; /* Line number in above file */
- uint32 datasize; /* Size requested */
uint32 SpecialValue; /* Underrun marker value */
};