database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-04 04:42:17 +03:00
Code Activity

Add a missing walIndexUnmap() call to the checkpoint code. Change a couple of SQLITE_CANTOPEN constants to SQLITE_CANTOPEN_BKPT.

Browse Source 
FossilOrigin-Name: 1f9e8c5c27ae2c68bc01d8e2bb2c662be7b3f161
This commit is contained in:
dan
2010-04-30 11:43:28 +00:00
parent 1bc6171c23
commit 87bfb51ef8
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\san\sassert()\sin\ssqlite3WalRead(). C Add\sa\smissing\swalIndexUnmap()\scall\sto\sthe\scheckpoint\scode.\sChange\sa\scouple\sof\sSQLITE_CANTOPEN\sconstants\sto\sSQLITE_CANTOPEN_BKPT.
D 2010-04-30T10:24:54 D 2010-04-30T11:43:29
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +150,7 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0 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/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
F src/pager.c 434f9751fc2dfc11ade004282deda5f8560bcba2 F src/pager.c 434f9751fc2dfc11ade004282deda5f8560bcba2
F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
@@ -221,7 +221,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
F src/wal.c 153dc952b5a759dcd6200562d227c56f8e18974f F src/wal.c 9327e0d4e2b19dcf5614d3bb8cdff25ebbe0e290
F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294 F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885 F src/where.c faadd9c2bf08868e5135192b44e0d753e363a885
@@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P a4741cb54dd5e753d48fd05ac9dbe27ee4aa1ec0 P 2e7a0050e192dd197d4db92393ab120897c14836
R 67a224d9b8436f4afd79983ba9c6427a R c2c9e5e0c48b0291d2627d6aeb69855a
U dan U dan
Z 3903311d96c904ad2185b988a7ff9441 Z e7fa4c17c25ce2a31997877294b65d50

2
manifest.uuid
View File

@@ -1 +1 @@
2e7a0050e192dd197d4db92393ab120897c14836 1f9e8c5c27ae2c68bc01d8e2bb2c662be7b3f161

4
src/os_unix.c
View File

@@ -4984,13 +4984,13 @@ static int unixShmOpen(
pFile->h = open(zName, O_RDWR|O_CREAT, 0664); pFile->h = open(zName, O_RDWR|O_CREAT, 0664);
if( pFile->h<0 ){ if( pFile->h<0 ){
rc = SQLITE_CANTOPEN; rc = SQLITE_CANTOPEN_BKPT;
goto shm_open_err; goto shm_open_err;
} }
rc = fstat(pFile->h, &sStat); rc = fstat(pFile->h, &sStat);
if( rc ){ if( rc ){
rc = SQLITE_CANTOPEN; rc = SQLITE_CANTOPEN_BKPT;
goto shm_open_err; goto shm_open_err;
} }
pFile->fid.dev = sStat.st_dev; pFile->fid.dev = sStat.st_dev;

3
src/wal.c
View File

@@ -567,7 +567,7 @@ int sqlite3WalOpen(
int nWal; /* Length of zWal in bytes */ int nWal; /* Length of zWal in bytes */
assert( zDb ); 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. */ /* Allocate an instance of struct Wal to return. */
*ppWal = 0; *ppWal = 0;
@@ -1237,6 +1237,7 @@ int sqlite3WalCheckpoint(
} }
/* Release the locks. */ /* Release the locks. */
walIndexUnmap(pWal);
walSetLock(pWal, SQLITE_SHM_UNLOCK); walSetLock(pWal, SQLITE_SHM_UNLOCK);
return rc; return rc;
} }