From: dan <dan@noemail.net>
Date: Fri, 30 Apr 2010 09:32:06 +0000 (+0000)
Subject: Add a missing walIndexUnmap() to sqlite3WalSnapshotOpen().
X-Git-Tag: version-3.7.2~455^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba51590bcd443671d09f9320be2a218e58e26232;p=thirdparty%2Fsqlite.git

Add a missing walIndexUnmap() to sqlite3WalSnapshotOpen().

FossilOrigin-Name: 72b95fde15dae56390dc8d4168fb2757447e289e
---

diff --git a/manifest b/manifest
index f1b485ae53..552a63398f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\sbugfix\sinto\swal\sbranch.
-D 2010-04-30T06:02:31
+C Add\sa\smissing\swalIndexUnmap()\sto\ssqlite3WalSnapshotOpen().
+D 2010-04-30T09:32:06
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +150,7 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
-F src/os_unix.c d9b2b017216075bba93cd4cb38f23396d3d02eb1
+F src/os_unix.c 4237d2a6429307307ebd1e7c1e3ccec875468907
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
 F src/pager.c 07c3522319a449db9dc732da828a09c4c55c41a4
 F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
@@ -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 d9d76a8189a9ac670cd2d5d5dd0c5019194727d7
+F src/wal.c b617892b95ac3f82e657e3c047ad6883111f6b8c
 F src/wal.h d0a7048e68a86d3fe4639858d7f592606545d224
 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 a92c1851da10acf51e7f6f086b8a23bd731940b3 f660be615a0c1f4641782a83744533f5d3119218
-R 789557e2ecf4320c154527de09c21ada
+P 265e66e6984c32999bf93981e3b1d19887dfe599
+R 7b9c465ab8c7541a3a7b291b0b84a4e5
 U dan
-Z b95a42f00187a9dd3e8e01985f34fa1c
+Z 9561c62faf9368c39d4969e72108b9f2
diff --git a/manifest.uuid b/manifest.uuid
index 85d7bc1b3c..8d2667d652 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-265e66e6984c32999bf93981e3b1d19887dfe599
\ No newline at end of file
+72b95fde15dae56390dc8d4168fb2757447e289e
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 8480b5f447..fee07cb27e 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5083,7 +5083,7 @@ static int unixShmClose(sqlite3_shm *pSharedMem){
 ** written into pNewSize.  A writer lock is held on the shared memory
 ** segment while resizing it.
 **
-** If ppBuffer is not NULL, the a reader lock is acquired no the shared
+** If ppBuffer is not NULL, the a reader lock is acquired on the shared
 ** memory segment and *ppBuffer is made to point to the start of the 
 ** shared memory segment.  xShmRelease() must be called to release the
 ** lock.
diff --git a/src/wal.c b/src/wal.c
index 0e44e561f3..9d518c16a0 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -889,6 +889,8 @@ int sqlite3WalOpenSnapshot(Wal *pWal, int *pChanged){
       }
     }
   }
+
+  walIndexUnmap(pWal);
   return rc;
 }
 
@@ -1082,6 +1084,7 @@ int sqlite3WalFrames(
   assert( WAL_FRAME_HDRSIZE==(4 * 2 + 2*sizeof(u32)) );
   assert( pList );
   assert( pWal->lockState==SQLITE_SHM_WRITE );
+  assert( pWal->pWiData==0 );
 
   /* If this is the first frame written into the log, write the log 
   ** header to the start of the log file. See comments at the top of
@@ -1158,6 +1161,7 @@ int sqlite3WalFrames(
       return rc;
     }
   }
+  assert( pWal->pWiData==0 );
 
   /* Append data to the log summary. It is not necessary to lock the 
   ** wal-index to do this as the RESERVED lock held on the db file