diff --git a/manifest b/manifest index 5048173d7c..8a5fd27015 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\supdates\sfrom\strunk. -D 2016-04-21T15:03:37.535 +C Add\sa\sfunction\sprototype\sin\sorder\sto\sfix\sa\scompiler\swarning. +D 2016-04-21T15:24:46.372 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -366,7 +366,7 @@ F src/pager.c bb8c7ff706aa88e7c2ec9a6175a128c01bc3ae5f F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681 F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8 -F src/pcache.h 60bc9893bfc0e16f8178fb5d8b6fcb8fab1d93c0 +F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9 F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05 F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84 F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c @@ -1484,7 +1484,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 d9768de502e34da42f3ad955947c23da50f57bce c4f165c460c4244ed434107feac005efa3c386cf -R 46a947ce1c80cd48530d3e6dff00dfca +P cc28106e5c196c0a9678fbbd06f6afd49271a8e8 +R c97bc8da233adc2bbb054b217c885bd5 U drh -Z 049109eccf475c334bc4eb599a0e0693 +Z fa8f1e96dc1996c819bff77f7b75b34d diff --git a/manifest.uuid b/manifest.uuid index 8cdc841c3b..31bd76e737 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cc28106e5c196c0a9678fbbd06f6afd49271a8e8 \ No newline at end of file +49aec9718d61c9f12aed96f530128666c3b01c81 \ No newline at end of file diff --git a/src/pcache.h b/src/pcache.h index 0caf605ff8..04bce289d0 100644 --- a/src/pcache.h +++ b/src/pcache.h @@ -99,6 +99,7 @@ void sqlite3PcacheDrop(PgHdr*); /* Remove page from cache */ void sqlite3PcacheMakeDirty(PgHdr*); /* Make sure page is marked dirty */ void sqlite3PcacheMakeClean(PgHdr*); /* Mark a single page as clean */ void sqlite3PcacheCleanAll(PCache*); /* Mark all dirty list pages as clean */ +void sqlite3PcacheClearWritable(PCache*); /* Change a page number. Used by incr-vacuum. */ void sqlite3PcacheMove(PgHdr*, Pgno);