From a4e1d8f844512e6d3f25b3a91bcdf21d931c2798 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Nov 2000 21:00:41 -0700 Subject: BitKeeper/triggers/post-commit send the diffs Docs/manual.texi updated change history include/my_sys.h Moved safemalloc_mem_limit here mysys/safemalloc.c fixed up safemalloc_mem_limit sql/mysqld.cc moved safemalloc_mem_limit declaration to my_sys.h BitKeeper/triggers/post-commit: send the diffs Docs/manual.texi: updated change history include/my_sys.h: Moved safemalloc_mem_limit here mysys/safemalloc.c: fixed up safemalloc_mem_limit sql/mysqld.cc: moved safemalloc_mem_limit declaration to my_sys.h --- mysys/safemalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'mysys') diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 589ed1c457b..34fcfff756c 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -73,9 +73,7 @@ #include "my_static.h" #include "mysys_err.h" -#ifndef DBUG_OFF -ulonglong safemalloc_mem_limit = 0; -#endif +ulonglong safemalloc_mem_limit = ~(ulonglong)0; #define pNext tInt._pNext #define pPrev tInt._pPrev @@ -133,12 +131,9 @@ gptr _mymalloc (uint uSize, const char *sFile, uint uLine, myf MyFlags) if (!sf_malloc_quick) (void) _sanity (sFile, uLine); -#ifndef DBUG_OFF - if(safemalloc_mem_limit && - uSize + lCurMemory > safemalloc_mem_limit) + if(uSize + lCurMemory > safemalloc_mem_limit) pTmp = 0; else -#endif /* Allocate the physical memory */ pTmp = (struct remember *) malloc ( sizeof (struct irem) /* remember data */ -- cgit v1.2.1