mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

BitKeeper/triggers/post-commit

Browse source 
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
This commit is contained in:
unknown 2000-11-04 21:00:41 -07:00
commit e07aa7950e
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mysys/safemalloc.c
View file

@ -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 */