diff options
| -rw-r--r-- | manifest | 24 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/pcache1.c | 4 |
3 files changed, 20 insertions, 10 deletions
@@ -1,5 +1,8 @@ -C Add\sa\smissing\scall\sto\ssqlite3PagerSync()\sremoved\sby\s[ce552d975]\sto\sthe\sbackup\scode. -D 2011-01-25T18:19:25 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Fix\snew\scompiler\swarnings\sin\spcache1.c\sthat\swere\sintroduced\sby\sthe\srecent\nperformance\senhancement\spatches\sof\s[e14649301138b684]. +D 2011-01-25T18:30:51.294 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -167,7 +170,7 @@ F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58 F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050 -F src/pcache1.c 54401ef4ea296b5bc2950bfbf5e68d6e931ab676 +F src/pcache1.c 71948ab1b3c792675a7676f991b53f3386cf0af4 F src/pragma.c 8a6cd3c787f882fa44f6490d2411fc26839ce8f3 F src/prepare.c 395b3fab1b93f45b6aa194b23ebc201221c47b99 F src/printf.c df2ff3bb5409e8958136933342c46464fbd017e7 @@ -897,7 +900,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P f12b5d76854c2f294ac60afe38a6dac37eb5b174 -R 085f3541c695880a57ad39b45c4ccb90 -U dan -Z d44ae9b8b3c13e9672f7c0d2b1c1ba1f +P 1965b85318c1fac62fae9691059021b298c17dde +R e2194786a7af1bc58874d331b4d38324 +U drh +Z 1ce03f19d621ba40ce2711b30eaeab7c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFNPxbeoxKgR168RlERAmLIAJ9qPhe/e/BRFS7gQNSAhVYcXdVllgCeNPtT +BRtjsNpdZ3Uj5WkxW69HZ1g= +=xwOA +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index dc04c747e..6fe948e00 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1965b85318c1fac62fae9691059021b298c17dde
\ No newline at end of file +c17703ec1e604934f8bd5b1f66f34b19d17a6d1f
\ No newline at end of file diff --git a/src/pcache1.c b/src/pcache1.c index 50765a2fa..93435fecd 100644 --- a/src/pcache1.c +++ b/src/pcache1.c @@ -672,7 +672,7 @@ static int pcache1Pagecount(sqlite3_pcache *p){ ** 5. Otherwise, allocate and return a new page buffer. */ static void *pcache1Fetch(sqlite3_pcache *p, unsigned int iKey, int createFlag){ - unsigned int nPinned; + int nPinned; PCache1 *pCache = (PCache1 *)p; PGroup *pGroup; PgHdr1 *pPage = 0; @@ -713,7 +713,7 @@ static void *pcache1Fetch(sqlite3_pcache *p, unsigned int iKey, int createFlag){ assert( pCache->mxPinned == pCache->nMax*9/10 ); if( createFlag==1 && ( nPinned>=pGroup->mxPinned - || nPinned>=pCache->mxPinned + || nPinned>=(int)pCache->mxPinned || pcache1UnderMemoryPressure(pCache) )){ goto fetch_out; |