From: danielk1977 <danielk1977@noemail.net>
Date: Thu, 21 Aug 2008 04:41:01 +0000 (+0000)
Subject: Move an assert() in sqlite3PcacheDirtyPage() so that it does not occur before local... 
X-Git-Tag: version-3.6.10~602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3c5d3239a658aaff40b86f5c5c7c2e64b21dc3;p=thirdparty%2Fsqlite.git

Move an assert() in sqlite3PcacheDirtyPage() so that it does not occur before local variable declarations. Ticket #3325. (CVS 5575)

FossilOrigin-Name: 899fa19d1ab9c40a2ffc1c5170476292d0509e33
---

diff --git a/manifest b/manifest
index fba9dccd46..31a97c523d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sleftover\sPGHDR_TO_DATA\smacro\sfrom\spager.c.\sTicket\s#3323.\s(CVS\s5574)
-D 2008-08-21T04:35:19
+C Move\san\sassert()\sin\ssqlite3PcacheDirtyPage()\sso\sthat\sit\sdoes\snot\soccur\sbefore\slocal\svariable\sdeclarations.\sTicket\s#3325.\s(CVS\s5575)
+D 2008-08-21T04:41:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0b1c022000f55221454a7846022f11674d8024bf
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -138,7 +138,7 @@ F src/os_win.c aefe9ee26430678a19a058a874e4e2bd91398142
 F src/pager.c 08e257feabce0d2b3f9cba83915327e2f97a51a7
 F src/pager.h fb9376af5ba8e1eb78ee3b4f15eb0f60658ffd65
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
-F src/pcache.c cf7a7c81366e42330ff9c84d1f3591c905289c3d
+F src/pcache.c e244ef4b7019ce08b768b3e019f5c39585dc7a96
 F src/pcache.h 71ade7a84ed87d9d20507315260b1d91808d7c9a
 F src/pragma.c f5b271b090af7fcedd308d7c5807a5503f7a853d
 F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 00b177985ee08f13a7781d095936da3beaf0408c
-R 8b85ab03b807b81e22342fe88061675a
+P 5e9559c0490b9e0395e1da4d36bd33942350978c
+R ffb9b74aabb8421663a6722de8981c79
 U danielk1977
-Z 4faef0c342826d18c5f3474e10d7d202
+Z e689954593a083b11a089928219e4342
diff --git a/manifest.uuid b/manifest.uuid
index 969c3b2e46..037df2ae1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e9559c0490b9e0395e1da4d36bd33942350978c
\ No newline at end of file
+899fa19d1ab9c40a2ffc1c5170476292d0509e33
\ No newline at end of file
diff --git a/src/pcache.c b/src/pcache.c
index f688bcc990..ffaa5e8f4e 100644
--- a/src/pcache.c
+++ b/src/pcache.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file implements that page cache.
 **
-** @(#) $Id: pcache.c,v 1.2 2008/08/20 21:47:46 drh Exp $
+** @(#) $Id: pcache.c,v 1.3 2008/08/21 04:41:02 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -1030,7 +1030,6 @@ PgHdr *sqlite3PcacheDirtyList(PCache *pCache){
 */
 PgHdr *sqlite3PcacheDirtyPage(PCache *pCache){
   PgHdr *p = 0;
-  assert( pCache->iInUseMM );
 #if 1
   PgHdr *pIter;
   Pgno min_pgno;
@@ -1043,6 +1042,7 @@ PgHdr *sqlite3PcacheDirtyPage(PCache *pCache){
 #else
   for(p=pCache->pDirty; p && p->nRef; p=p->pNext);
 #endif
+  assert( pCache->iInUseMM );
   if( p ){
     p->pDirty = 0;
   }