From: drh <drh@noemail.net>
Date: Thu, 13 May 2010 15:44:00 +0000 (+0000)
Subject: Allow sqlite3WalCheckpoint() to be called even if the WAL is in the
X-Git-Tag: version-3.7.2~380
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cccc940cc293f1ba39481ef5c196f2e61500959;p=thirdparty%2Fsqlite.git

Allow sqlite3WalCheckpoint() to be called even if the WAL is in the
SQLITE_SHM_READ state, as sometimes happens after an error.

FossilOrigin-Name: 175b296f9b9680f605537f52a8a53944deaa5391
---

diff --git a/manifest b/manifest
index c4c232f0ef..55dc301c59 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Remerge\smistaken\stest_osinst.c\schanges.
-D 2010-05-13T09:40:30
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Allow\ssqlite3WalCheckpoint()\sto\sbe\scalled\seven\sif\sthe\sWAL\sis\sin\sthe\nSQLITE_SHM_READ\sstate,\sas\ssometimes\shappens\safter\san\serror.
+D 2010-05-13T15:44:00
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -224,7 +227,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 ec1a6f944c65123c43bca2ddff466ea4d8a7f8b7
+F src/wal.c b59d841e78e11b0d37b2194b3522a855799a4d9a
 F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -814,7 +817,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 92ebdbc5f64ac63796ff56c1e1aec3b95c6bdd20 4c3e137803f86ec5a6c68bfaa29a2847ba48fd65
-R 7d00cff4c6e3f0c11d419f6f7551e787
-U dan
-Z 315a0d223a289ca32eb4beaafc7e35cb
+P e8c10d3cf601cc81a620f6c0ba5f195945a3f725
+R c616cb93d23b0cdfd59e536067b43dbd
+U drh
+Z c6979d7b9231c984649ced9e5922d0be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL7B5DoxKgR168RlERAqIyAJ94od8cLks28tVsbhFMyAj89ZqJdwCfYpyj
+EkxyMfbMhJhN1sSlNDztuWo=
+=g0yE
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index d676561b93..cd71b30437 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8c10d3cf601cc81a620f6c0ba5f195945a3f725
\ No newline at end of file
+175b296f9b9680f605537f52a8a53944deaa5391
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 5f4079e279..df35577706 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1467,8 +1467,8 @@ int sqlite3WalCheckpoint(
   ** be set to UNLOCK when this function returns. This is Ok.
   */
   assert( (pWal->lockState==SQLITE_SHM_UNLOCK)
-       || (pWal->exclusiveMode && pWal->lockState==SQLITE_SHM_READ)
-  );
+       || (pWal->lockState==SQLITE_SHM_READ) );
+  walSetLock(pWal, SQLITE_SHM_UNLOCK);
   do {
     rc = walSetLock(pWal, SQLITE_SHM_CHECKPOINT);
   }while( rc==SQLITE_BUSY && xBusyHandler(pBusyHandlerArg) );