Merge changes from the 3.16.1 release

FossilOrigin-Name: dcbec226ca250fb9711edee41c2fafc883707808

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f17249c72631dd9a4d2c05468faad9f01709a020,7370188f60426b20c27f16cced2cc0d0bd0b6c7b..0e21fb4dcfd544e07619683872d937391fc6be9a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\srecent\senhancements\sfrom\strunk,\sand\sespecially\sthe\spragma-as-vtab\nchange.
- D 2016-12-16T21:29:42.129
- F Makefile.in f9d781832f4e9f4a833a020bd736e4d5f1ed412c
 -C Version\s3.16.1
 -D 2017-01-03T18:27:03.194
 -F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
++C Merge\schanges\sfrom\sthe\s3.16.1\srelease
++D 2017-01-03T20:20:30.331
++F Makefile.in 6107f11b53eb2067c13b84c7c5b88c9a7764728a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
 +F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
+ F VERSION 571f747f178898e400d90570d3ca7898732170a6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -303,19 -303,16 +303,19 @@@ F ext/session/sessionG.test 01ef705096a
  F ext/session/session_common.tcl 9b696a341cf1d3744823715ed92bb19749b6c3d4
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
- F ext/session/sqlite3session.c 37485891b4add26cf61495df193c419f36556a32
+ F ext/session/sqlite3session.c c61a43396368ec00dc127f7bc647e9bd6a4ee5fb
  F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2
  F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 38978da90d2322ef899168c33be472d058318a21
 -F main.mk 2cf5f0362c5687fd8e912c3a327b49a2e8ba0f9b
++F main.mk a3bcc219fb5a9af18c74cccff2f203a9353fb6c8
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -334,10 -331,10 +334,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 66e482529d76e74634db5499d997c16c8bdee221
 -F src/btree.c d2c100618784bd89c089fcef03ff6e789768ecae
++F src/btree.c 95ffea8c0d34a07aa2858717f01f72889ff68b2e
  F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
- F src/build.c 52970b6cf3cf3107551a5d6dd668b0b261b0b491
+ F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
@@@ -354,10 -351,10 +354,10 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 91ba5d0143e66479081536ebbaff1850ec9f57d9
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
- F src/main.c 350f909c5435f2898f1b5fcd416695ab347889c4
- F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
 -F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
++F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
+ F src/malloc.c f3fad34cd570022abca558c573f1761fb09a8212
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -375,29 -372,28 +375,29 @@@ 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 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 +F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 3677b427b24c39b3d210a723a021d31bc474b6cc
 -F src/pager.c 9dc72d23eebbdf992bd69f2ab954d0d3a27c7340
 -F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
++F src/pager.c e2da02d2e731bd111383578a1dd2f0a58fd3d4c1
 +F src/pager.h 366f586bbcb92b797b954d95bf322083e8e5cf5c
  F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
  F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c 5a23557e490e7ac5afef097efc4b59dce5b482c2
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c f84626dbd0f6324177e89ce55adc8a041ecff1f2
++F src/pragma.c 5924c96852a8f653935ae9c4f287ac26b7dfc1d9
  F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
- F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
+ F src/printf.c 0c8579432f47948d9be5077eb590e8c4a01be667
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c e4c687333c5fa33b1ce05c37bfbea6e09d3dbee9
- F src/shell.c 9be556ad9c7cf429d0acc48e386960d290c4df75
+ F src/select.c dfb6cadc3dcfba1b1bdbfba62ebba2b4b673413e
+ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
 -F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
 +F src/sqlite.h.in b716539d1ab93f3027b320f2393f81cc3e0f0bf9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 0d51585f9517dc54cd90445443b4414644f1693a
 -F src/sqliteInt.h 2075e22d50833ca2d9956d0b7a6bfb845ad05dd2
++F src/sqliteInt.h 25ec82510aed8458adfd1efda99c44b66309a22a
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -457,16 -453,16 +457,16 @@@ F src/treeview.c 4e44ade3bfe59d82005039
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
  F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c e68e8ced7328f22d2cf7b4c898c394a0de34cdf1
+ F src/util.c 1534060bc034cdc51381c040c8bd6252dbcb64c9
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 6521a150c69a5c30b0ec979ec4b6d6609b7cf919
- F src/vdbe.h 0c74f6305fb43b9b282dacaff102272370e327d4
- F src/vdbeInt.h 42e498dbe96475dbb3fda3d85d8fd2a87eff60a2
- F src/vdbeapi.c ae2cab17a15f495b461275dd3e280881eca96221
- F src/vdbeaux.c f5edc89007f8a49e224089a4a4dddbc11bd38213
 -F src/vdbe.c 88bd6c32b333580d2661ac3afe33369757fb1522
++F src/vdbe.c 5870d9f62f5c0b9fd25d41ca47b92314bf045b5b
+ F src/vdbe.h 50ee139f9c68fff91be1d717ed3a6abbd496919c
+ F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 -F src/vdbeapi.c d6ebaa465f070eb1af8ba4e7b34583ece87bdd24
++F src/vdbeapi.c fe1a1ebda30a22c9a20ebf8cf2d88b2685c01bb8
+ F src/vdbeaux.c 12919c5aa354296d6b9ba808bca3e9dda836858c
  F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
  F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
- F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
+ F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
@@@ -632,8 -628,9 +632,9 @@@ F test/ctime.test a4effbe5472ef6c0308c4
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/cursorhint2.test fa41f0d997e67db921d08c31e73111b32811201a
  F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
+ F test/dbfuzz.c 8cc2bdb818b4483a052f9f80f96be74cbd9a6e1d
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 +F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -992,10 -990,10 +995,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/ossfuzz.c e469138f4be3e92df6173b79b3b216ab6e17b407
  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
@@@ -1034,10 -1032,10 +1037,10 @@@ 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 cacc565ed7e3ac467866af6705dd99020fdf2ee2
+ F test/rowvalue.test f4a60835c949ec4b8ddc15d78d8a9b412b805875
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1099,10 -1097,11 +1102,11 @@@ F test/shell2.test e242a9912f44f4c23c3d
  F test/shell3.test 9b95ba643eaa228376f06a898fb410ee9b6e57c1
  F test/shell4.test 89ad573879a745974ff2df20ff97c5d6ffffbd5d
  F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
- F test/shell6.test 806472f6ffdd31d632e27dbe8515c0c45f68f3ec
+ F test/shell6.test cff624fadf71bdb5e3a9b0f86eaf59a43c0622b1
+ F test/shell7.test 07751911b294698e0c5df67bcbd29e7d2f0f2907
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 8ab5d2c7c5cd3fe7f172d366e6e74e887cb33cb4
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1542,7 -1541,10 +1546,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 a24f805b5eb22452a22b937d372abba4426ae771 94689e3bdac2eabbcf1a51d741c2604ed4bd8a40
- R 99f9fac4dd71e5c2dfe1225bcc4121f7
 -P a60b60d6b6ba3e3b17b7bb7d7e19ea0e6b40fa68
 -R d4f21444156ee47430dc0da1e1aa71cf
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.16.1 *
++P 4b1e780433fe72611b065962e419965c6644f430 979f04392853b8053817a3eea2fc679947b437fd
++R dd7dacb01d1a57d277a37278ab487925
  U drh
- Z c3fb66a2aaa996fe285f51957b54e3c7
 -Z 2e6a3477dce68797105cb19052da7dea
++Z 726fb522e356ff65bb471fabced148d1

diff --cc manifest.uuid
index 208b17d295fae8def9f5b9479fde3cf9f661441c,29df27f9edfa1014cb58c295e9735c6da103e718..80d29ace1a5da194a888e35eb651aed1b5485e99
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4b1e780433fe72611b065962e419965c6644f430
 -979f04392853b8053817a3eea2fc679947b437fd
++dcbec226ca250fb9711edee41c2fafc883707808

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge