diff --git a/manifest b/manifest
index 831cb4e089..9eee5e7f9d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancement\sto\s(6844).\sIf\ssqlite3_exec()\sis\sto\sreturn\sSQLITE_NOMEM\sbecause\sit\sfails\sto\sallocate\sspace\sfor\san\serror\smessage,\sset\sthe\sdatabase\serror-code\sto\sSQLITE_NOMEM\stoo.\s(CVS\s6962)
-D 2009-08-07T16:56:00
+C Suppress\svarious\scompiler\swarnings.\s(CVS\s6963)
+D 2009-08-08T18:01:08
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,14 +106,14 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025
 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3
 F src/bitvec.c e08f6c1a9551b88081fc737916c6c3fd5029a6cf
 F src/btmutex.c 0f43a75bb5b8147b386e8e1c3e71ba734e3863b7
-F src/btree.c 46f24d0b659583bae13b7f22534e5f529ebc0684
+F src/btree.c 812c365f76ec4cf5965e1920f40505debc1ef4e9
 F src/btree.h 577448a890c2ab9b21e6ab74f073526184bceebe
 F src/btreeInt.h 1c86297e69380f6577e7ae67452597dd8d5c2705
 F src/build.c a15de7c5d020a778b641fca0b2510126843f4b30
 F src/callback.c cb68b21b0d4ae7d11ae0e487933bce3323784dcf
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
-F src/delete.c fb2dfdd9696dfc4ef232c806ccecf307f94ea277
+F src/delete.c f1502d3c210f80eebef475a04891e8ea80099553
 F src/expr.c d069ba1e060f296ea4f18fb85198fafefd00b22f
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c 9856373f5315f6b8690d7f07f7191aa9f279ca87
@@ -200,7 +200,7 @@ F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
 F src/tokenize.c af8a56e6a50c5042fc305bfa796275e9bf26ff2b
 F src/trigger.c f248851055abbb6fc583b1809b69a234a85a01b2
-F src/update.c 245a652c0c1b1affd7ccf2a1970a465977e7bfa2
+F src/update.c 4da327f706c0d0dfedf4d92154b1b5688bdea0ac
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c c2416f60ae704a8c4990e4909aa810f90cbffa07
 F src/vacuum.c 3fe0eebea6d2311c1c2ab2962887d11f7a4dcfb0
@@ -208,10 +208,10 @@ F src/vdbe.c 0ce57f8211899b59d1d6f1642f79e75fc212d6d0
 F src/vdbe.h 457b6c70f02885cec1f5225b5e6441d067b55d3f
 F src/vdbeInt.h 831c254a6eef237ef4664c8381a0137586567007
 F src/vdbeapi.c 0ab8ada7260b32031ca97f338caecf0812460624
-F src/vdbeaux.c e57911d2c8d9b482d8ddd87a10fa50df14a9e095
+F src/vdbeaux.c 4956536a636468fd07284028c39aab65ea99777e
 F src/vdbeblob.c a3f3e0e877fc64ea50165eec2855f5ada4477611
 F src/vdbemem.c bfc25f9ef4fa914b473303566459552bdb2e008a
-F src/vtab.c b19c4e96dcf2b89b5b2ba48e8ef624e654a59b2c
+F src/vtab.c aedd76e8670d5a5379f93804398d3ba960125547
 F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
 F src/where.c 7e696d69a6d1b0fa277da2801ae4126dd4db0f8c
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -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 b6bdfdc69df4fc6cad669fd8b2cbaa9ecb95cb78
-R 279f0a5dbce20015c863e1c0261964b1
-U danielk1977
-Z 63484d3c2db8453d492823a329fc660c
+P 8293fa19c02abe0e2a7594b9bceac28929de8fdf
+R 1388774ac72d09f419d1b27cfbadc8a0
+U drh
+Z 0ab5f86d0c04eff0d1cfe3a04ab5c3f0
diff --git a/manifest.uuid b/manifest.uuid
index f5198b19d3..9154c2f409 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8293fa19c02abe0e2a7594b9bceac28929de8fdf
\ No newline at end of file
+257e9b575029f63277ed602d1402f87cfa15d22e
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index b7c2197f7c..71a2f96dab 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.703 2009/07/24 19:01:19 drh Exp $
+** $Id: btree.c,v 1.704 2009/08/08 18:01:08 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -429,8 +429,7 @@ static void invalidateAllOverflowCache(BtShared *pBt){
 /*
 ** This function is called before modifying the contents of a table
 ** b-tree to invalidate any incrblob cursors that are open on the
-** row or one of the rows being modified. Argument pgnoRoot is the 
-** root-page of the table b-tree. 
+** row or one of the rows being modified.
 **
 ** If argument isClearTable is true, then the entire contents of the
 ** table is about to be deleted. In this case invalidate all incrblob
@@ -442,7 +441,6 @@ static void invalidateAllOverflowCache(BtShared *pBt){
 */
 static void invalidateIncrblobCursors(
   Btree *pBtree,          /* The database file to check */
-  Pgno pgnoRoot,          /* Look for read cursors on this btree */
   i64 iRow,               /* The rowid that might be changing */
   int isClearTable        /* True if all rows are being deleted */
 ){
@@ -459,7 +457,7 @@ static void invalidateIncrblobCursors(
 #else
   #define invalidateOverflowCache(x)
   #define invalidateAllOverflowCache(x)
-  #define invalidateIncrblobCursors(w,x,y,z)
+  #define invalidateIncrblobCursors(x,y,z)
 #endif
 
 /*
@@ -4905,11 +4903,12 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
     }
 
     nLeaf = get4byte(&pTrunk->aData[4]);
-    if( nLeaf > pBt->usableSize/4 - 2 ){
+    assert( pBt->usableSize>32 );
+    if( nLeaf > (u32)pBt->usableSize/4 - 2 ){
       rc = SQLITE_CORRUPT_BKPT;
       goto freepage_out;
     }
-    if( nLeaf<pBt->usableSize/4 - 8 ){
+    if( nLeaf < (u32)pBt->usableSize/4 - 8 ){
       /* In this case there is room on the trunk page to insert the page
       ** being freed as a new leaf.
       **
@@ -6459,7 +6458,7 @@ int sqlite3BtreeInsert(
   ** cursors open on the row being replaced (assuming this is a replace
   ** operation - if it is not, the following is a no-op).  */
   if( pCur->pKeyInfo==0 ){
-    invalidateIncrblobCursors(p, pCur->pgnoRoot, nKey, 0);
+    invalidateIncrblobCursors(p, nKey, 0);
   }
 
   /* Save the positions of any other cursors open on this table.
@@ -6588,7 +6587,7 @@ int sqlite3BtreeDelete(BtCursor *pCur){
   /* If this is a delete operation to remove a row from a table b-tree,
   ** invalidate any incrblob cursors open on the row being deleted.  */
   if( pCur->pKeyInfo==0 ){
-    invalidateIncrblobCursors(p, pCur->pgnoRoot, pCur->info.nKey, 0);
+    invalidateIncrblobCursors(p, pCur->info.nKey, 0);
   }
 
   iCellDepth = pCur->iPage;
@@ -6745,8 +6744,8 @@ static int btreeCreateTable(Btree *p, int *piTable, int flags){
       ** by extending the file), the current page at position pgnoMove
       ** is already journaled.
       */
-      u8 eType;
-      Pgno iPtrPage;
+      u8 eType = 0;
+      Pgno iPtrPage = 0;
 
       releasePage(pPageMove);
 
@@ -6887,7 +6886,7 @@ int sqlite3BtreeClearTable(Btree *p, int iTable, int *pnChange){
   /* Invalidate all incrblob cursors open on table iTable (assuming iTable
   ** is the root of a table b-tree - if it is not, the following call is
   ** a no-op).  */
-  invalidateIncrblobCursors(p, iTable, 0, 1);
+  invalidateIncrblobCursors(p, 0, 1);
 
   rc = saveAllCursors(pBt, (Pgno)iTable, 0);
   if( SQLITE_OK==rc ){
diff --git a/src/delete.c b/src/delete.c
index 11ee88e2bf..f2d632f9b7 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $Id: delete.c,v 1.206 2009/07/27 10:05:05 danielk1977 Exp $
+** $Id: delete.c,v 1.207 2009/08/08 18:01:08 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -244,7 +244,7 @@ void sqlite3DeleteFrom(
   int iEndBeforeTrigger = 0;   /* Exit of before trigger program */
   u32 old_col_mask = 0;        /* Mask of OLD.* columns in use */
 
-  sContext.pParse = 0;
+  memset(&sContext, 0, sizeof(sContext));
   db = pParse->db;
   if( pParse->nErr || db->mallocFailed ){
     goto delete_from_cleanup;
diff --git a/src/update.c b/src/update.c
index c9e55dc6ce..dcf8612132 100644
--- a/src/update.c
+++ b/src/update.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.206 2009/07/27 10:05:06 danielk1977 Exp $
+** $Id: update.c,v 1.207 2009/08/08 18:01:08 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -137,7 +137,7 @@ void sqlite3Update(
   int regData;           /* New data for the row */
   int regRowSet = 0;     /* Rowset of rows to be updated */
 
-  sContext.pParse = 0;
+  memset(&sContext, 0, sizeof(sContext));
   db = pParse->db;
   if( pParse->nErr || db->mallocFailed ){
     goto update_cleanup;
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 1c0908d5b5..ce413dc8f3 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.479 2009/07/25 17:42:22 drh Exp $
+** $Id: vdbeaux.c,v 1.480 2009/08/08 18:01:08 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -2644,8 +2644,8 @@ int sqlite3VdbeIdxRowid(sqlite3 *db, BtCursor *pCur, i64 *rowid){
     goto idx_rowid_corruption;
   }
   lenRowid = sqlite3VdbeSerialTypeLen(typeRowid);
-  testcase( m.n==szHdr+lenRowid );
-  if( unlikely(m.n<szHdr+lenRowid) ){
+  testcase( (u32)m.n==szHdr+lenRowid );
+  if( unlikely((u32)m.n<szHdr+lenRowid) ){
     goto idx_rowid_corruption;
   }
 
diff --git a/src/vtab.c b/src/vtab.c
index e09dcd53a3..e47495152d 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.93 2009/07/24 17:58:53 danielk1977 Exp $
+** $Id: vtab.c,v 1.94 2009/08/08 18:01:08 drh Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -568,7 +568,6 @@ int sqlite3VtabCallConnect(Parse *pParse, Table *pTab){
     rc = SQLITE_ERROR;
   }else{
     char *zErr = 0;
-    sqlite3 *db = pParse->db;
     rc = vtabCallConstructor(db, pTab, pMod, pMod->pModule->xConnect, &zErr);
     if( rc!=SQLITE_OK ){
       sqlite3ErrorMsg(pParse, "%s", zErr);