Changes to support interrupting a checkpoint using sqlite3_interrupt().

FossilOrigin-Name: c88d36e251abec24aa7e37cf550e148904b9fd2d

diff --cc manifest
index 9ca575bc89f2563f25d3cd369999288ee7923a82,dba9d4bbe22827ce189611e56089f1373925fc4a..846685db9b2db0ebf1f2e6eeaf5026965a8363ac
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Small\ssize\sreduction\sand\sperformance\sincrease\sin\sthe\sstring\sduplicator.
- D 2016-10-17T00:48:06.879
 -C Questionable\schanges\sto\ssupport\sinterruptible\scheckpoint\sin\sZipVFS.
 -D 2016-08-13T14:30:23.488
 -F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
++C Changes\sto\ssupport\sinterrupting\sa\scheckpoint\susing\ssqlite3_interrupt().
++D 2016-10-17T15:28:39.424
 +F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
 +F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 -F VERSION 25e2e333adeff5965520bc8db999c658898c972d
 +F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -322,37 -321,36 +322,37 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 -F src/alter.c cc28ab933ae615b22add0d609794ffb6596b42ea
 -F src/analyze.c 37fedc80ac966ce1745811746e68e4d8fa64c7fe
 -F src/attach.c 771153bd1f4ab0b97a44a13dde2c7e5e1efeba22
 -F src/auth.c 5c8e0f37f785f935f589496801edd19840485853
 -F src/backup.c 17cd25a36d49330df2bacd2cadf2a61f3b525976
 +F src/alter.c 299117695b1f21ac62dfc5b608588810ba22ed0d
 +F src/analyze.c 8b62b2cf4da85451534ac0af82cafc418d837f68
 +F src/attach.c 8c19066b4b5357b5d66154e856c61df01e71203a
 +F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 +F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 7a45743fb947c89bd6c972bfb18c8f80c070ad51
 -F src/btree.c a4a3ac603c88e04c1fde62b58800cd57bf536534
 -F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
++F src/btree.c 4d035fb52b0ef9658d43dfe604413185dff7a5d1
 +F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 7c3c780b703c09314032c8f6e4e7c1d80241a818
 +F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
  F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 -F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
 -F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
 -F src/expr.c 9c5eca8602f6c496e8d4eefefe2aae3d831dd510
 +F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 +F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
 +F src/expr.c aac0b8d39373ce8f1d47829ce12c3d7af90c46a6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 -F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
 +F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
  F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
 -F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
 -F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
 +F src/global.c 9da4ca5d74b90715f0ec4957f3d17a4749009f34
 +F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 -F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 +F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 +F src/insert.c 2d5e197f2f60351937b201196965fd14cd88489c
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 -F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
 -F src/main.c 52dad7971461bd1bdaa78c375016ebd883e11608
 -F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
 +F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
- F src/main.c c9e49e376820bccca55fa9bf2ca321a51725db91
++F src/main.c 395bfa7a200943395f7742a40b6671ec400559ea
 +F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -371,34 -369,34 +371,34 @@@ F src/os.h 8e976e59eb4ca1c0fca6d35ee803
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
  F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
 -F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 +F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2
- F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 -F src/pager.c 3d3ab7cb526615189750420e673d90689a9592a1
++F src/pager.c 49b6c163832498838c92d0c4c90721576ae707b7
+ F src/pager.h 0a19b1e212d0f5d0507f186ae1cca4e523d09d1a
 -F src/parse.y 99b676e6fc2f4e331ab93e76b3987cffdbd28efa
 -F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
 +F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
 +F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
 -F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
 +F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 +F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 -F src/resolve.c 0392c6686586b1d4dac9a4106959f03ddd70e9aa
 +F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 -F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
 -F src/sqlite.h.in 47e4df9bae9d474991a7e1468aab5cb1b6d49def
 +F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
 +F src/shell.c b80396d2fadce4681397707e30078bf416e1dec2
- F src/sqlite.h.in 1011de924a6a7340c74e5442cb76f7b49c134512
++F src/sqlite.h.in 7ef021d74ac7d4004c784a16ad015508f171c4bf
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
 +F src/sqliteInt.h 8d241c2c0a1a7b6611d3e9398f41d69426da850d
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
 -F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
 -F src/test1.c 0a0909cf7962d2359db329c08d15b90b4b6e724f
 +F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
 +F src/test1.c 1f1a399956c8730d5f7b09c729e98764f2082162
- F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
+ F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 -F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
 +F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
  F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02
@@@ -447,30 -444,30 +447,30 @@@ F src/test_windirent.h 7edc57e2faa72702
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
 -F src/treeview.c c56d6ddbed564efda746236b35bcbb8238daac4b
 -F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 -F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 +F src/treeview.c f51b75a28b377adde9f79bc3deb6c7770bcf97c0
 +F src/trigger.c 3419bb9862983d84d70735fb4c94b21b934cd0c5
 +F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 -F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 -F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
 -F src/vdbe.c 94c114b3cc72098ea783f04f7a21d7f6b3e1dc73
 -F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 -F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 -F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
 -F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
 -F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
 -F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
 +F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
 +F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
- F src/vdbe.c ad4b4df4885067cd82ec025e5ff0d3eb02e84d4d
++F src/vdbe.c 6aa65e22bd1a44eb0cb1fa040cb9955b6670e5dd
 +F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
 +F src/vdbeInt.h 0a18713d0a2fec6807d076bd333d9bf3e57530cd
 +F src/vdbeapi.c 8272f9342c39ab8d7eb4b9decc6caa7bc75b7d83
 +F src/vdbeaux.c 7229203e4e4a3b6eaeeddc807c2287d912c0da74
 +F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
 +F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
 -F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4
 +F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
- F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
+ F src/wal.c 0b44e89742024d3b6992bf404d2ab692113e1e60
+ F src/wal.h bf03a23da3100ab25e5c0363450233cfee09cfc2
 -F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
 -F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c 98ce9f3b8d92b6f741b9f3498f9619695739256e
 +F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
 +F src/where.c 5f846d94bb3d35b3146d9915eb301ee362957b0a
 +F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
 +F src/wherecode.c 717a65294df46f30e9b9933d2a63a4bcbca5a9a8
 +F src/whereexpr.c 379d0017fb7bc9e5a4d8cd4b056c747de946430e
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1525,7 -1511,7 +1526,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 16d88a907730e3773a1320dbaf1f82c2bc71d71f
- R 2f0998819cd5004bd7aa9d1c4c13ab4c
- U drh
- Z 1e4256190583968ad55966afe2350526
 -P 8a5f41c7b1718507524adef1a2730e99cf53270a
 -R 849b04c7250237751d57f7138163050e
++P cda998f080cb00779d8c0d1c83d8fe2b74462cd4 c7a9f26d118c7a453d45fa73efa4d1ab79301659
++R 00d803db9be93d1b8c7f2861fe9a2270
+ U dan
 -Z ee26012ae6b15aa5080b28eefbd3549a
++Z b37d65eeae68b321dec11a25d79485cc

diff --cc manifest.uuid
index bf23f2a097b3856a2a56367ca4fa961388bf2bf1,5e6d740c1e2f07d30bdbea67659ac46d759ca66a..ff8b6bf968a3a4f0b3bc60600ace2b7d3d82925e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cda998f080cb00779d8c0d1c83d8fe2b74462cd4
 -c7a9f26d118c7a453d45fa73efa4d1ab79301659
++c88d36e251abec24aa7e37cf550e148904b9fd2d

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
index 8857d133267be5884c297091672a4fc1531549f0,31e6427b12ad30eb91fa936f38ab90acb8ce81ce..b24a1990557e0de38b9a8c71a211ef1d8ab1456c
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -1034,7 -1026,7 +1034,8 @@@ struct sqlite3_io_methods 
  #define SQLITE_FCNTL_RBU                    26
  #define SQLITE_FCNTL_VFS_POINTER            27
  #define SQLITE_FCNTL_JOURNAL_POINTER        28
 -#define SQLITE_FCNTL_PDB                    29
 +#define SQLITE_FCNTL_WIN32_GET_HANDLE       29
++#define SQLITE_FCNTL_PDB                    30
  
  /* deprecated names */
  #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE

diff --cc src/vdbe.c
Simple merge