aboutsummaryrefslogtreecommitdiff
path: root/src/mem2.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-03-08 15:17:53 +0000
committerdan <dan@noemail.net>2010-03-08 15:17:53 +0000
commit3b4aae569a792ce7ab7eed5d334ca040264c449d (patch)
tree9e73bbb18a1a4f35ff6bfde54c0731e1417960c3 /src/mem2.c
parent01d38564289e9e7a01b29db450af41cbda18e6ba (diff)
downloadsqlite-3b4aae569a792ce7ab7eed5d334ca040264c449d.tar.gz
sqlite-3b4aae569a792ce7ab7eed5d334ca040264c449d.zip
Correct an assert() in mem2.c (test code only).
FossilOrigin-Name: 1a88e31b03e090732243a70bec082b32ecf77c43
Diffstat (limited to 'src/mem2.c')
-rw-r--r--src/mem2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mem2.c b/src/mem2.c
index 46e8bc63b..5eb937ed4 100644
--- a/src/mem2.c
+++ b/src/mem2.c
@@ -300,7 +300,8 @@ static void sqlite3MemFree(void *pPrior){
struct MemBlockHdr *pHdr;
void **pBt;
char *z;
- assert( sqlite3GlobalConfig.bMemstat || mem.mutex!=0 );
+ assert( sqlite3GlobalConfig.bMemstat || sqlite3GlobalConfig.bCoreMutex==0
+ || mem.mutex!=0 );
pHdr = sqlite3MemsysGetHeader(pPrior);
pBt = (void**)pHdr;
pBt -= pHdr->nBacktraceSlots;