Add a missing walIndexUnmap() call to the checkpoint code. Change a couple of SQLITE_...

FossilOrigin-Name: 1f9e8c5c27ae2c68bc01d8e2bb2c662be7b3f161

diff --git a/manifest b/manifest
index ed5ff95ccefd2e633d74ca2f5b5440940fc4315c..2b907e980d7caf2019a1ad3dea155064cc1c5ad9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sin\ssqlite3WalRead().
-D 2010-04-30T10:24:54
+C Add\sa\smissing\swalIndexUnmap()\scall\sto\sthe\scheckpoint\scode.\sChange\sa\scouple\sof\sSQLITE_CANTOPEN\sconstants\sto\sSQLITE_CANTOPEN_BKPT.
+D 2010-04-30T11:43:29
 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 f5e41bd2f563f85c10a9c9e62bbac8e3b783efc3
+F src/os_unix.c 7451a717574c9b9809ad7c429345482c29239230
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
 F src/pager.c 434f9751fc2dfc11ade004282deda5f8560bcba2
 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 153dc952b5a759dcd6200562d227c56f8e18974f
+F src/wal.c 9327e0d4e2b19dcf5614d3bb8cdff25ebbe0e290
 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 a4741cb54dd5e753d48fd05ac9dbe27ee4aa1ec0
-R 67a224d9b8436f4afd79983ba9c6427a
+P 2e7a0050e192dd197d4db92393ab120897c14836
+R c2c9e5e0c48b0291d2627d6aeb69855a
 U dan
-Z 3903311d96c904ad2185b988a7ff9441
+Z e7fa4c17c25ce2a31997877294b65d50

diff --git a/manifest.uuid b/manifest.uuid
index de04fd111d486382ff60fd35fa87d4b35a4a6526..4ba7670f107cf0bec5975142697e1e794093d6fd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e7a0050e192dd197d4db92393ab120897c14836
\ No newline at end of file
+1f9e8c5c27ae2c68bc01d8e2bb2c662be7b3f161
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index decf2efc8aecd4bcd0da04709b48fe5a154e62d7..d991ec9d5da335bfeca2f6a8addbe8ab8cf6990e 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4984,13 +4984,13 @@ static int unixShmOpen(
 
     pFile->h = open(zName, O_RDWR|O_CREAT, 0664);
     if( pFile->h<0 ){
-      rc = SQLITE_CANTOPEN;
+      rc = SQLITE_CANTOPEN_BKPT;
       goto shm_open_err;
     }
 
     rc = fstat(pFile->h, &sStat);
     if( rc ){
-      rc = SQLITE_CANTOPEN;
+      rc = SQLITE_CANTOPEN_BKPT;
       goto shm_open_err;
     }
     pFile->fid.dev = sStat.st_dev;

diff --git a/src/wal.c b/src/wal.c
index 38bbe458cf956bc6f3a342c711882dd8bee31092..30af69ff6efa4c4ef62878cc387ae7022787e092 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -567,7 +567,7 @@ int sqlite3WalOpen(
   int nWal;                       /* Length of zWal in bytes */
 
   assert( zDb );
-  if( pVfs->xShmOpen==0 ) return SQLITE_CANTOPEN;
+  if( pVfs->xShmOpen==0 ) return SQLITE_CANTOPEN_BKPT;
 
   /* Allocate an instance of struct Wal to return. */
   *ppWal = 0;
@@ -1237,6 +1237,7 @@ int sqlite3WalCheckpoint(
   }
 
   /* Release the locks. */
+  walIndexUnmap(pWal);
   walSetLock(pWal, SQLITE_SHM_UNLOCK);
   return rc;
 }