aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/backup.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/manifest b/manifest
index 91055d9e6..439d67722 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sOOM\serrors\sin\sthe\sANALYSIS\sloader\sget\sreported\sback\sout\sto\nhigh-level\slayers.\s\sStrange\sbehavior\scan\sresult\sotherwise.\s(CVS\s6292)
-D 2009-02-13T16:59:53
+C Fix\sa\scompiler\swarning\sin\sbackup.c.\s(CVS\s6293)
+D 2009-02-16T16:23:09
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -101,7 +101,7 @@ F src/alter.c f93d13aae63ea1a5ee604d76041be354311d08a5
F src/analyze.c fc6056826fe67aa0856d4e01591be8f9266ac415
F src/attach.c 81d37d1948f409146a7b22b96998fd90649d1fd3
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
-F src/backup.c 0fb3c8d9ba8345c06d8c8fa2bd753babf443e091
+F src/backup.c dbce7056b235206f7e3c303ca52d3108b9746082
F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a
F src/btree.c 71f30e74389aa7ae51421592dfaf69511152677c
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P dd179ff2986bc2a86d70bbe927fd0e123e17d398
-R e4eafd6d7a9222fb3694b7d165dcb016
+P 88a6355cd65ddb319dbc27b5248c664dbf599778
+R 5552e6ebc399162cdd6a993d7e8fe464
U drh
-Z 8611aeec67c9c6405052380c9627df52
+Z 4c3c75537f9c4889ca785e51d0035c10
diff --git a/manifest.uuid b/manifest.uuid
index 2aabdcaf9..198938ef0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88a6355cd65ddb319dbc27b5248c664dbf599778 \ No newline at end of file
+82222fbf5d5a085ce3e2c172c648a4c6d9750626 \ No newline at end of file
diff --git a/src/backup.c b/src/backup.c
index aef1fd4b2..aa9ff3218 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -12,7 +12,7 @@
** This file contains the implementation of the sqlite3_backup_XXX()
** API functions and the related features.
**
-** $Id: backup.c,v 1.10 2009/02/12 17:01:50 danielk1977 Exp $
+** $Id: backup.c,v 1.11 2009/02/16 16:23:09 drh Exp $
*/
#include "sqliteInt.h"
#include "btreeInt.h"
@@ -373,7 +373,7 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
if( nSrcPagesize<nDestPagesize ){
int ratio = nDestPagesize/nSrcPagesize;
nDestTruncate = (nSrcPage+ratio-1)/ratio;
- if( nDestTruncate==PENDING_BYTE_PAGE(p->pDest->pBt) ){
+ if( nDestTruncate==(int)PENDING_BYTE_PAGE(p->pDest->pBt) ){
nDestTruncate--;
}
}else{