Remove an ALWAYS() from a condition that can in fact be false under very

obscure circumstances. (CVS 6918)

FossilOrigin-Name: 38083228956ac05df45f44447ab39c64852239d2

diff --git a/manifest b/manifest
index 81eb63d4e779d6936afa0076abc98bf1bc428b3e..b213b2c34790f3573a2f70d36cd6c5e6c1ccb14f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\ssimplifications\sto\sbtree.c,\sespecially\sthe\ssqlite3BtreeKey()\sand\nsqlite3BtreeData()\sfunctions.\s\sNew\sassert()\sstatements\sadded\sto\sverify\nthat\sthese\sroutines\sare\scalled\scorrectly.\s(CVS\s6917)
-D 2009-07-22T00:35:24
+C Remove\san\sALWAYS()\sfrom\sa\scondition\sthat\scan\sin\sfact\sbe\sfalse\sunder\svery\nobscure\scircumstances.\s(CVS\s6918)
+D 2009-07-22T02:02:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
-F src/pager.c 9838393b4a5118eb935ac0939621177157a38bc1
+F src/pager.c b4edef365c4013e75ddce21c0a4ac046bfe1b969
 F src/pager.h 5bd96ed838e4156e0effa5ffe746bce4c0112c24
 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 0b41dfc066b60ccabbf1a9ab4db41ebcb73a2799
-R ec7248901916ae3e3f51419c6b86f672
+P 96cfd079528501f6f1e658ce8a5a4e3bdea729be
+R a8bd2be33969844ee5d481d489c419c7
 U drh
-Z e29c38deeafef8c5fb9e4e32f65332cb
+Z bc1c68166bf29dbfc1cab9b7c7ad4f50

diff --git a/manifest.uuid b/manifest.uuid
index 96faec28b35f06d5b321b21a2bf92291b68bc08c..deca36d08ac140b35ffd3f64f989fca798a09228 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96cfd079528501f6f1e658ce8a5a4e3bdea729be
\ No newline at end of file
+38083228956ac05df45f44447ab39c64852239d2
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 0ef32332631433f49b29b8ece25bcf2e09e5b34a..03fc50fb4dff3174c2c992e34f3d1d4893713e9a 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.610 2009/07/21 19:25:24 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.611 2009/07/22 02:02:40 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -5205,7 +5205,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
   pPg->flags &= ~PGHDR_NEED_SYNC;
   pPgOld = pager_lookup(pPager, pgno);
   assert( !pPgOld || pPgOld->nRef==1 );
-  if( ALWAYS(pPgOld) ){
+  if( pPgOld ){
     pPg->flags |= (pPgOld->flags&PGHDR_NEED_SYNC);
     sqlite3PcacheDrop(pPgOld);
   }