From: dan <dan@noemail.net>
Date: Mon, 8 Mar 2010 15:17:53 +0000 (+0000)
Subject: Correct an assert() in mem2.c (test code only).
X-Git-Tag: version-3.7.2~551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b4aae569a792ce7ab7eed5d334ca040264c449d;p=thirdparty%2Fsqlite.git

Correct an assert() in mem2.c (test code only).

FossilOrigin-Name: 1a88e31b03e090732243a70bec082b32ecf77c43
---

diff --git a/manifest b/manifest
index ff6f3017b0..42d3b8e174 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\sthe\sstmt.test\sscript\sas\spart\sof\sthe\sinmemory_journal\spermutation.
-D 2010-03-08T10:32:39
+C Correct\san\sassert()\sin\smem2.c\s(test\scode\sonly).
+D 2010-03-08T15:17:53
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/main.c 7d89bb6dcc6993a8d32f4f22dae3e57c50a41399
 F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
-F src/mem2.c 92b4f772b1ee7469e256f1c2eff0b51a0ba19460
+F src/mem2.c ee752297650632935218dcf3b20c5ed5899cb4b5
 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
 F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
 F src/memjournal.c 5bfc2f33c914946e2f77ed3f882aff14dfc9355d
@@ -792,7 +792,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 81ff698f62c8133818a3db1997ae7427705da23f
-R 53db8f06fbeaf6a1bc871ef8d254d665
+P 049cadf92bca5645a6f398eb83940344643fcacf
+R 44531d6e0649c8c2f5ca2e5b3e312dbd
 U dan
-Z 17c0f6ce3acd613201ed438561cec8d6
+Z c0272962af3309a07b6881e16dadde1c
diff --git a/manifest.uuid b/manifest.uuid
index b6c4a6adcc..3c1d23795c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-049cadf92bca5645a6f398eb83940344643fcacf
\ No newline at end of file
+1a88e31b03e090732243a70bec082b32ecf77c43
\ No newline at end of file
diff --git a/src/mem2.c b/src/mem2.c
index 46e8bc63bc..5eb937ed43 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;