From: dan <dan@noemail.net>
Date: Fri, 30 Apr 2010 17:05:23 +0000 (+0000)
Subject: Fix a problem with resizing the wal-index mapping after the mapping has been extended... 
X-Git-Tag: version-3.7.2~455^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe05aa144cc48632ed4af3e90dbaac3b8d0ef317;p=thirdparty%2Fsqlite.git

Fix a problem with resizing the wal-index mapping after the mapping has been extended by an external process.

FossilOrigin-Name: 79d356fea6008a8adf8ebd4906571375f3cf5213
---

diff --git a/manifest b/manifest
index 6bab8bba72..f7b6e13c48 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\scalculating\sthe\srequired\ssize\sof\sthe\swal-index\swhen\sappending\sframes.
-D 2010-04-30T16:50:00
+C Fix\sa\sproblem\swith\sresizing\sthe\swal-index\smapping\safter\sthe\smapping\shas\sbeen\sextended\sby\san\sexternal\sprocess.
+D 2010-04-30T17:05:24
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -221,7 +221,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 f4bdb4f86fa7e08a69c8955e3bd22b5026143427
+F src/wal.c 2115a90d42e1cc14c0f196677609f6c9b32afec7
 F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
@@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 2afc33de2b2012d034fb0d2057a5a45e304516ca
-R 70ef57c4a03e427eca1482f7ccd1ced8
+P 9526b11130f3ed2f5227386a26263c767214603a
+R 91978a8283887836c2a96b7f05bffc8f
 U dan
-Z 0d70ee7035126be286a826f0c20d1cde
+Z 2ea44366a0f8d457f9964ceb9f3d8476
diff --git a/manifest.uuid b/manifest.uuid
index 8b1c1630d4..b4eca7de53 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9526b11130f3ed2f5227386a26263c767214603a
\ No newline at end of file
+79d356fea6008a8adf8ebd4906571375f3cf5213
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 3ac18c74d6..d406383a28 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -926,7 +926,7 @@ int sqlite3WalOpenSnapshot(Wal *pWal, int *pChanged){
     }else{
       /* Check if the mapping needs to grow. */
       if( pWal->hdr.iLastPg 
-       && walIndexEntry(pWal->hdr.iLastPg)>=pWal->szWIndex
+       && walIndexEntry(pWal->hdr.iLastPg)*sizeof(u32)>=pWal->szWIndex
       ){
          walIndexRemap(pWal, -1);
       }