Fix a bug in checkpoint introduced by [181ceb32ea].

FossilOrigin-Name: b499dbc88a67b4200b5f527be88be4ac90f7043f

diff --git a/manifest b/manifest
index fade5ab5ae8cc5510c20fdc59686bda9cbef3535..fd503a559523397029d69af9543b8cd48899935c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sasserts\sand\sother\sthings\sin\sthe\snew\sWAL\sbranch.
-D 2010-05-31T11:16:31
+C Fix\sa\sbug\sin\scheckpoint\sintroduced\sby\s[181ceb32ea].
+D 2010-05-31T11:39:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -224,7 +224,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 23b3733a0be297d74c4c123fd0672a9c97727386
+F src/wal.c e7dcdd7ac97301a9f8550ba25842959e9eca7c53
 F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -815,7 +815,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ace58acbf1fad13d2be96cafebc3a22875098d03
-R ff9d1967b732326f3bce0ee3d72a6c66
+P 181ceb32ead7f540a7c6437f53a5b0f3e78162db
+R 5b2efbc364d42c3e87c8f8e6c9af7dc3
 U dan
-Z afad2ce8da9a593f49e5e1a5ca3459df
+Z 846280efab83efdd590118c7ffb7a0dc

diff --git a/manifest.uuid b/manifest.uuid
index 0c7c8c289a4d5bb476fd59e72b3679e22619e9c6..336f2e0275201eb899661a1d42fa30a6df22f8c6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-181ceb32ead7f540a7c6437f53a5b0f3e78162db
\ No newline at end of file
+b499dbc88a67b4200b5f527be88be4ac90f7043f
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 943691692744f87533ca2463ed692412ac2a9892..81eb557beb96a0c2c0086a0b1027dd20e5ddfe65 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1352,7 +1352,7 @@ static int walCheckpoint(
   for(i=1; i<WAL_NREADER; i++){
     u32 y = pInfo->aReadMark[i];
     if( y>0 && (mxSafeFrame==0 || mxSafeFrame>=y) ){
-      if( y<pWal->hdr.mxFrame
+      if( y<=pWal->hdr.mxFrame
        && (rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1))==SQLITE_OK
       ){
         pInfo->aReadMark[i] = 0;