diff options
| author | drh <drh@noemail.net> | 2016-05-13 11:50:00 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-05-13 11:50:00 +0000 |
| commit | 935c4d8484c2416bd3f885b286c1ee9efada3338 (patch) | |
| tree | 712bf2e1180ea69f62c5e7c686685d4f87985893 | |
| parent | 7aeb216a19ab7108537f8dbaa32a05edb25f80c4 (diff) | |
| download | sqlite-935c4d8484c2416bd3f885b286c1ee9efada3338.tar.gz sqlite-935c4d8484c2416bd3f885b286c1ee9efada3338.zip | |
Fix pager_end_transaction() to ensure that a ROLLBACK does not clobber
unwritten pages in a TEMP file pcache.
FossilOrigin-Name: 9495d33879221c1821331dc72c61a6a3d182f526
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/pager.c | 2 |
3 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Additional\sdebugging\sand\stracing\slogic\sfor\spcache.c,\sturned\soff\sby\sdefault\nusing\san\s"#if\s0". -D 2016-05-13T04:24:25.046 +C Fix\spager_end_transaction()\sto\sensure\sthat\sa\sROLLBACK\sdoes\snot\sclobber\nunwritten\spages\sin\sa\sTEMP\sfile\spcache. +D 2016-05-13T11:50:00.812 F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd @@ -364,7 +364,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234 F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c b6b3f2aff301cb025b23a8586666c91355cb3c69 +F src/pager.c 64f42bd0d20f180f99727ce5a3755a97c9a12700 F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681 F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e F src/pcache.c ad5ce697dc5a734caddb2b1eac83b195da95ddbe @@ -1488,7 +1488,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 24d9fbc1d0f99b90577ecd6edcd3bc1abc76633f -R d638f11a5a2154aefeed14f79e8ebc4d +P 32a62e3bd46cf58586617d3f8b1a971c91df205e +R 7ea6babb6ca28821d5ebb371842cc2c9 U drh -Z 291bccc6a32f88cd8cda8747cf2307e8 +Z 5e0d604d556f91727b00c6f570867611 diff --git a/manifest.uuid b/manifest.uuid index 527363dab..bed68c74a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -32a62e3bd46cf58586617d3f8b1a971c91df205e
\ No newline at end of file +9495d33879221c1821331dc72c61a6a3d182f526
\ No newline at end of file diff --git a/src/pager.c b/src/pager.c index d8ea37122..095fce537 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2033,7 +2033,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ pPager->pInJournal = 0; pPager->nRec = 0; if( rc==SQLITE_OK ){ - if( pagerFlushOnCommit(pPager) ){ + if( !pPager->tempFile || (bCommit && pagerFlushOnCommit(pPager)) ){ sqlite3PcacheCleanAll(pPager->pPCache); }else{ sqlite3PcacheClearWritable(pPager->pPCache); |