From: dan <dan@noemail.net>
Date: Tue, 1 Jun 2010 10:44:28 +0000 (+0000)
Subject: If the checkpoint fails to obtain an exclusive lock on one of the read-lock bytes... 
X-Git-Tag: version-3.7.2~328^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8772967056105211bf23629ce8831e1c5f8c0ee;p=thirdparty%2Fsqlite.git

If the checkpoint fails to obtain an exclusive lock on one of the read-lock bytes, do not consider this an error.

FossilOrigin-Name: 9e95e35728cf69a0ae50e774d7f6c71a41b17d97
---

diff --git a/manifest b/manifest
index d666dcc53c..c8a67d96a4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sthe\stest\scases\sin\swal2.test.
-D 2010-06-01T07:51:48
+C If\sthe\scheckpoint\sfails\sto\sobtain\san\sexclusive\slock\son\sone\sof\sthe\sread-lock\sbytes,\sdo\snot\sconsider\sthis\san\serror.
+D 2010-06-01T10:44:29
 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 d03eebb92e496ef6d4bd15d366bea2ee28e7fd8c
+F src/wal.c a18a20596b8b9ea09ed9c8741f9193e165f0cb6f
 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 e8e666ab8273f5db5265f0773b39820f75b6df1a
-R 2d4ce189d914f65f52a0b2f34d21a2a0
+P cd5fbcbce8b55f24c0bf349b179c26e333ff7172
+R ffdd8604f512c88d10a6de2f3e641d78
 U dan
-Z 83ba1556aa3dec7d9475b47421ab5c55
+Z ee37b099dcdd95ac7a6b81975abdbcbe
diff --git a/manifest.uuid b/manifest.uuid
index 16b6531a90..3a29660225 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd5fbcbce8b55f24c0bf349b179c26e333ff7172
\ No newline at end of file
+9e95e35728cf69a0ae50e774d7f6c71a41b17d97
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 0a67de59d5..49becd0e0a 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1424,7 +1424,7 @@ static int walCheckpoint(
     u32 y = pInfo->aReadMark[i];
     if( y>0 && (mxSafeFrame==0 || mxSafeFrame>=y) ){
       if( y<=pWal->hdr.mxFrame
-       && (rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1))==SQLITE_OK
+       && walLockExclusive(pWal, WAL_READ_LOCK(i), 1)==SQLITE_OK
       ){
         pInfo->aReadMark[i] = 0;
         walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);