From: dan <dan@noemail.net>
Date: Mon, 1 Apr 2013 16:56:41 +0000 (+0000)
Subject: Ensure that a checkpoint does not use an out-of-date mapping.
X-Git-Tag: version-3.7.17~114^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f55a4cf80c73937610e8b39d553f2c8aea02af8f;p=thirdparty%2Fsqlite.git

Ensure that a checkpoint does not use an out-of-date mapping.

FossilOrigin-Name: a1040f0397d57855500926494c978623286ddc77
---

diff --git a/manifest b/manifest
index 2da91083ab..334e902f99 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\slog\smessage\sin\swal.c.
-D 2013-04-01T14:35:01.078
+C Ensure\sthat\sa\scheckpoint\sdoes\snot\suse\san\sout-of-date\smapping.
+D 2013-04-01T16:56:41.264
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -249,7 +249,7 @@ F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
 F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
 F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
-F src/wal.c 04029f2691e937d7f5dd638580679a560fec93bf
+F src/wal.c 94b5fed2df988fb12f5bf17256e2840e56957a85
 F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
 F src/where.c 9a16c0b84bbeb054d11fda96e9e037ae310bd54e
@@ -1040,7 +1040,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b724aa5889f2e09cf0cbef133a672e6486755104
-R 96d4d8288650bd963603cf34d02b8e9c
+P 83fc48d16572443373e5de62adbd4cd53c2f7786
+R 8c156c43b98e65e90e42898654b4787f
 U dan
-Z 48fdc69d5f63c210da250932a430f955
+Z 8dac7ace59503631e98c649abc9ec1b4
diff --git a/manifest.uuid b/manifest.uuid
index 9b3ffd9c61..b6b3710dd3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83fc48d16572443373e5de62adbd4cd53c2f7786
\ No newline at end of file
+a1040f0397d57855500926494c978623286ddc77
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index abbd7032f5..881f0a4c78 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2956,6 +2956,9 @@ int sqlite3WalCheckpoint(
   /* Read the wal-index header. */
   if( rc==SQLITE_OK ){
     rc = walIndexReadHdr(pWal, &isChanged);
+    if( isChanged && pWal->pDbFd->pMethods->iVersion>=3 ){
+      sqlite3OsUnfetch(pWal->pDbFd, 0, 0);
+    }
   }
 
   /* Copy data from the log to the database file. */