From: drh <drh@noemail.net>
Date: Mon, 31 May 2010 14:39:31 +0000 (+0000)
Subject: Make sure WAL alway requests enough shared-memory space.
X-Git-Tag: version-3.7.2~328^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18b7f604aa5c9e7f7b64f20b1e9831a17aa586a5;p=thirdparty%2Fsqlite.git

Make sure WAL alway requests enough shared-memory space.

FossilOrigin-Name: 138f128317b6695530ca3fde7be4cdf22548cd22
---

diff --git a/manifest b/manifest
index 8714d8e534..51ed68be23 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Remove\sthe\stests\sthat\senable\stracing\sbased\son\sthe\sexistance\sof\sthe\s"vdbe_*"\nfiles\swhen\sin\sSQLITE_DEBUG\smode.
-D 2010-05-31T14:28:25
+C Make\ssure\sWAL\salway\srequests\senough\sshared-memory\sspace.
+D 2010-05-31T14:39:32
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -227,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 0b3cf78459540fc9504cc5c6670d656e95d6f48a
+F src/wal.c a5c23eb5a711011b3d9ce0e58e9c6826c1a42744
 F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -818,14 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 99fde69e61d12cf95b47db70c4647c30be2d2f45
-R bc84b1625879662df25035180d9a6b40
+P cdbb4e7ca7ec27e7e80dd66529d9d565f547887a
+R 0cd2d59cc635661a08e8f76abffdc3d2
 U drh
-Z 557b084a9cedee49fe71bb7313d705d2
+Z dc2c36f1d50f839e595b320efdcb8ab5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMA8eMoxKgR168RlERAtMlAJ9Lk1hI3pjjh9vYYjXEq7GFOZUibgCeKF7o
-Jwb3xNe+tD2TRgoN2h0MCQk=
-=zEvj
+iD8DBQFMA8onoxKgR168RlERAomNAJ9Px0ZEOZ67oylLFVLVmToJYQgm1wCfRI4c
+30nVwH7EGnwL4KvwwqI5gwo=
+=gGIS
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 549fda8e04..7089db4d2b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdbb4e7ca7ec27e7e80dd66529d9d565f547887a
\ No newline at end of file
+138f128317b6695530ca3fde7be4cdf22548cd22
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 4287005886..1570e3dc8f 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1696,7 +1696,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal){
       }
     }
   }else{
-    rc = walIndexMap(pWal, pWal->hdr.mxFrame);
+    rc = walIndexMap(pWal, walMappingSize(pWal->hdr.mxFrame));
   }
   if( rc!=SQLITE_OK ){
     return rc;
@@ -1995,7 +1995,7 @@ int sqlite3WalBeginWriteTransaction(Wal *pWal){
   ** time the read transaction on this connection was started, then
   ** the write is disallowed.
   */
-  rc = walIndexMap(pWal, pWal->hdr.mxFrame);
+  rc = walIndexMap(pWal, walMappingSize(pWal->hdr.mxFrame));
   if( rc ){
     walUnlockExclusive(pWal, WAL_WRITE_LOCK, 1);
     pWal->writeLock = 0;