Merge all changes up through the 3.17.0 release.

FossilOrigin-Name: 1913a7581024719ea31b7343b2a42a4b60c1c8eb

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index b46aaa41047068f0b8b5617b1f9007c0ec8b3f26,2e7a8d98dc346dd55d88a02934661430988ac5e9..d07f805f54b56bd60f9a59e916d2f80690ae5d14
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\s3.17.0beta\schanges\sfrom\strunk.
- D 2017-02-08T16:55:29.013
 -C Version\s3.17.0
 -D 2017-02-13T16:02:40.361
 -F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
++C Merge\sall\schanges\sup\sthrough\sthe\s3.17.0\srelease.
++D 2017-02-13T16:17:04.451
 +F Makefile.in 0c27f4cee5d1d12f3a8d8fa88500c7264d2f4b36
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
 +F Makefile.msc 21aedd447ab31c455f963a71d9952841ed277814
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cddd8d88dc8202afa0ebc96da61fc4acbd1e96a5
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -264,7 -264,7 +264,7 @@@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c e83711f6f7bade2972a7b5ed2df34e6df5cafe33
 -F ext/rtree/rtree.c 358796a385de74e40ed66c103df77ba3c2e98fab
++F ext/rtree/rtree.c e1bb8d04672c9c5c753ac7fb42f7688363343020
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -340,9 -337,9 +340,9 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 -F src/btree.c 9fe65ab418d99e80289f024016b5e5e74c3059dd
 +F src/btree.c 05843aa2287d3246793cc09a32c3603566037f49
  F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
- F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
+ F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
  F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -360,10 -357,10 +360,10 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 -F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
 +F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
- F src/malloc.c dc2b84cd320e0498ef4209772d66f353df6e4eb2
+ F src/malloc.c f345c60d093d6c6cf451b99a7344a123b1a70fd9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -375,9 -372,9 +375,9 @@@ F src/mutex.c 8e45800ee78e0cd1f1f3fe8e3
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
- F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
+ F src/mutex_w32.c 3631e57d056062807ae2c92b79f3d1c05f04ecfe
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
 +F src/os.c c03b50496df5815e8f6d45bae4404b73cadf069b
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
@@@ -399,11 -396,10 +399,11 @@@ F src/resolve.c f9bc0de45a30a450da47b37
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
  F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
 -F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
 +F src/sqlite.h.in 080c30ae3f98fc4859cfb125fbe8430ae86fe8f1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h feb051fda6402dbb28092d4d4f3f0dc4e50bea5b
 -F src/sqliteInt.h 4dc66ec1948765f151899333f7a55267d807d099
++F src/sqliteInt.h 8f2b51c4adc37a831bb1ac500ac30def8230780c
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -463,12 -459,12 +463,12 @@@ F src/treeview.c 4e44ade3bfe59d82005039
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
  F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
+ F src/util.c 3d2ce209a89b95cf35bffa16440f57368576e2ee
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
 -F src/vdbe.c e7b1e860140f1d1803c6f4176b1e8f3801f3a290
 +F src/vdbe.c 2830f9c234b2ec833b9cf284a07ea6979d0e1e93
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
 -F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
 +F src/vdbeapi.c 56ef5bdfd94c73f0b29019e78cbf72ced9c35541
  F src/vdbeaux.c b9a36e530e6525ca9d9a685bc7b1d01fa77b5cf8
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
@@@ -476,10 -472,10 +476,10 @@@ F src/vdbesort.c eda25cb2d1727efca6f786
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -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 bc71775e23d23334e8f449aa31012d692dc09cb2
+ F src/where.c b0d81c6f24ea6aebb249c92c5d78ec8ab1452523
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
  F src/wherecode.c 99a8ced164c75edf41b3a865a75381c9adb38b28
  F src/whereexpr.c 35ad025389a632a3987a35617c878be3b3d70dc6
@@@ -1560,7 -1555,10 +1560,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 6c3f09028f070b2612c00466ec3f01e2098b818d 77b470b0df73dc5ae5ad2f0170ef7c50558c7c88
- R e76a98ec256b3e98892f5d07f7155185
 -P 25ebadd096ce98fd0f9fab809969d34b958794f6
 -R 26d6be3bef13897430f30b09b94a6365
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.17.0 *
++P 92dbd8753eb399f8e377ecd1f0805b606ee6fce9 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c
++R a0f617481e61949163b41b6ca12f055e
  U drh
- Z 912871f8ba2eca56d5dc14e65b128592
 -Z 05d3704e9807a2fa92650f94b28a08f4
++Z 4c6490b21766c3c3b1fc6f5f48bd4e36

diff --cc manifest.uuid
index adb1b14c86f37154368362fe3e7b01eeaddc4ff7,ef33d31047b8fea0dc82e72866dd3cdde03d2610..fa2397a3888556ffb0bed44c1a87f3f2c0be4229
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 92dbd8753eb399f8e377ecd1f0805b606ee6fce9
 -ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c
++1913a7581024719ea31b7343b2a42a4b60c1c8eb

diff --cc src/sqliteInt.h
Simple merge