database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code 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
This commit is contained in:
sasha@mysql.sashanet.com
2000-11-04 21:00:41 -07:00
parent 34c7229a63
commit fddab55df3
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 */