Merge all recent trunk changes, and especially the new

sqlite3_snapshot_recover() interface.

FossilOrigin-Name: 41a3af5443d8c97ba75cac7f082f06b508f77c24

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 21d3d4bccca767f5d1324903d21ed0886d329a89,4870b539525a989152159577358d82a000de762e..c3a0f49a28ae9a4574d514a5852ed231fd8be4e3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Update\stest\scase\sfor\sopening\sSHM\sfiles\sread/write\son\sa\sread-only\sconnection\nso\sthat\sthey\sare\sonly\sattempted\son\sDarwin\swith\sSQLITE_ENABLE_PRESIST_WAL.
- D 2016-11-26T20:12:40.118
- F Makefile.in c9c70541089a9755069a9dad0b609cf14a382649
 -C Add\sthe\ssqlite3_snapshot_recover()\sinterface\sand\srelated\sfunctionality.
 -D 2016-11-26T19:44:40.853
 -F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
++C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\snew\nsqlite3_snapshot_recover()\sinterface.
++D 2016-11-26T20:44:52.669
++F Makefile.in e9d578202731ea84020acb548d2b7a0fb681dbf0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc a8af814f63c124db048517b63a0b8650c3fc26fc
 -F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
++F Makefile.msc f51b70cb866a4256df2ac27d1da074e3737bf46c
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -314,7 -311,7 +314,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk b5332ec519585646b7a33c99d1768592776f9a3c
 -F main.mk 488af8651f927e27f9256e2f20daf63163b2d2eb
++F main.mk 7d77bc01d7916b4760baecaa2ade1bade6519c6f
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -333,10 -330,10 +333,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 67d1cc4ed947287c57a6e8a00af0b32672d1d10e
- F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
 -F src/btree.c 9b30dbe2f6306c50dc5af8296e67034400de37cb
++F src/btree.c f1818376b0e160c7af6eff363ea1799323f3b902
+ F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
+ F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
@@@ -352,10 -349,10 +352,10 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 2d5e197f2f60351937b201196965fd14cd88489c
+ F src/insert.c 2f8d2c1fa472409625cecacddd39a3b1c6811a26
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
- F src/main.c a393b7bf99214729f8343ab2abd2ea78d776e6f1
 -F src/main.c 5669ae83c6bd47f090aee26a6b548a882d69e9e1
++F src/main.c 0346ec90973d2b7d628e9fad13ff1f1c7c037859
  F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -374,34 -371,33 +374,34 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
 -F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 +F src/os_unix.c ab6fb76945f600f7e557ca6d7c59dc23e327be70
 +F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 3fea5fb3694c36870dc18730f914a52ed838b507
- F src/pager.h a409efecb53b5bc380e7da848d6de6a2e4958d8e
 -F src/pager.c 4e4aea7ced5734753ccbff4cf4bb4d032cf2173e
 -F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
++F src/pager.c 68343d9c9cab1981bf0b184cfe19e5e935b5bd65
++F src/pager.h 366f586bbcb92b797b954d95bf322083e8e5cf5c
  F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
  F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
 +F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
- F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
+ F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
+ F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
- F src/shell.c 63e54cfa1c7ec5b70a4c9a86502bc10280c3d5a3
- F src/sqlite.h.in 8078d183ab1bbe1263365fbc1bcd2f31fc46a6ef
+ F src/select.c 668c6865b16813dab5f9c18d3672fed11a5c34c5
+ F src/shell.c a3fc2c719ed6d381895cbdb66a4a9b6a791cb02e
 -F src/sqlite.h.in 566e3aa20e40f3eceda8bfb36c72504b4f10b500
++F src/sqlite.h.in 55c8eb735888a73cf39bdda1168df7571354e07d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h d8f69b332b83e8e822678ed7f845b20fdfbe5687
 -F src/sqliteInt.h c471d791b10c0f2164c8b7a87adc338e703c09cc
++F src/sqliteInt.h 2f3bf6ade77aff107b2c0f6201e04cf11c897b77
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
- F src/test1.c fce5f13ac4d0273be80f926fce71d78663af3b2b
 -F src/test1.c d6a047ea534fb68fedcb5a47f4db3baef6748294
++F src/test1.c bd204dc2caf8f0b2813884890950c5d3d7529119
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -414,10 -410,10 +414,10 @@@ F src/test_async.c 195ab49da082053fdb0f
  F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
  F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
- F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
+ F src/test_blob.c 6a4c7920d1d9c6cc0f7aa50c89c4f80016aeda83
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 371853b4691b482ec0bcdf77ec9e3f96dca75b04
 +F src/test_config.c c56fe0fc7bc903232931c932381dc69b020445d8
- F src/test_delete.c 32690ea215abf29dda589a580cd1b790389759b6
+ F src/test_delete.c 8499d4d323f2ec8e28301deb3d6ddd8eef8b8139
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -458,25 -454,25 +458,25 @@@ F src/update.c 1b8321100cac004f0721ab67
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 682df0100020f6dbf8127e3ae6a28c53efaeafb5
 -F src/vdbe.c 4a3ff567745aac67ffbb55d06fbecf19f88d12be
++F src/vdbe.c 87cfd557b6b83a86bfbba880876dbf8cfc8dfd3e
  F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h d8a56a491b752dbb5f671963b8c861ec72ea875e
- F src/vdbeapi.c 4ecb0af9414e50c36dcb5a245191a7964b8b74cc
- F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74
- F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
- F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
+ F src/vdbeInt.h 9b498d3cb52dc2efb53571fb8ae8e14cf298ce84
 -F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
++F src/vdbeapi.c ae2cab17a15f495b461275dd3e280881eca96221
+ F src/vdbeaux.c 50a8caa4c8ce8b4c26bad807a6cae89fcc3bdb7e
+ F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
+ F src/vdbemem.c 1af2f14ab0f7004b364933ddcfc767fb880d4742
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c b782fa386a4f7b5a8c974f481d8bc004464849a2
- F src/wal.h 8fed212c25dc0b33abb9c287ccd8e242796a73e8
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
++F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
++F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
- F src/where.c 952f76e7a03727480b274b66ca6641b1657cd591
+ F src/where.c 6bbf9284f4f15a6fa48663d033870cc0d7f5ee66
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
- F src/wherecode.c 717a65294df46f30e9b9933d2a63a4bcbca5a9a8
- F src/whereexpr.c a83d70154f3bbce5051a7e9710021f647c0fe4f2
+ F src/wherecode.c 4ea298998499db5a407ffd70e87e119a86ed7834
+ F src/whereexpr.c c19a84ac530835d37217db2181e4fe75901b7b97
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -989,8 -986,10 +991,10 @@@ F test/orderby7.test 3d1383d52ade5b9eb3
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
+ F test/ossfuzz.c ad79e867fb504338d324b08e0696db65a0c44d68
+ F test/ossshell.c d9f1a6f43e7bab45d6be857a5800f5d4a1861db3
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 -F test/pager1.test 841868017e9dd3cb459b8d78862091a7d9cff21d
 +F test/pager1.test 15d423765637d8cd54b025f90ed6c8dc311e2fc3
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1029,12 -1028,12 +1033,12 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
- F test/rowvalue.test bcd78c91fe2aadade6fd00d2616546650b9ebc9e
+ F test/rowvalue.test f4dc97fe52d4e206e25b3395588b9497a8eed3ff
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
- F test/rowvalue3.test 01399b7bf150b0d41abce76c18072da777c2500c
+ F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
  F test/rowvalue5.test c81c7d8cf36711ab37675ad7376084ae2a359cb6
  F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
@@@ -1535,7 -1535,8 +1540,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 a07c581e88aa4d9835f6144c0fd5e58ef42f14ac
- R 061d6c14387255b6c2b7db96406db959
 -P a4205a83e4ed977a89ecae665604993711f7dd3f e2c4bdf54fc1b9605226c7d6c79ef4f8302d6213
 -R e3a0631511335a83b0a91c37cc46bd7e
 -T +closed e2c4bdf54fc1b9605226c7d6c79ef4f8302d6213
++P d6a7bf80cfb0cdca2bd684adfaba2c3e8053f8a4 b70c85ce6d07b08e13f4ea99edb8f4855a6d7580
++R 2161f892ef1d3b0fc6c2c6b554391adf
  U drh
- Z deaa464aa4ff286e026ec1554bd7622c
 -Z 12f51558a308f260b27f24c87a70fdb2
++Z 5c9dbf6e2c8a2984cc671e3fd70ca4a9

diff --cc manifest.uuid
index 6c25c70c60e85d6d1637baf39bb3528e68d71fde,8b694c9f20c21170007085318ac8c4ec35a10a35..e84b2e3f30d14efea18724f220bf41d570db9d9a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d6a7bf80cfb0cdca2bd684adfaba2c3e8053f8a4
 -b70c85ce6d07b08e13f4ea99edb8f4855a6d7580
++41a3af5443d8c97ba75cac7f082f06b508f77c24

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc src/wal.h
Simple merge