Merge the 3.17.0beta changes from trunk.

FossilOrigin-Name: 92dbd8753eb399f8e377ecd1f0805b606ee6fce9

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

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

diff --cc main.mk
Simple merge

diff --cc manifest
index ab5c0d8cd6c19b1261171149282b214bb6bda41e,8fb5d8e602c6a157b929cc9082b6f19d2c3a2421..b46aaa41047068f0b8b5617b1f9007c0ec8b3f26
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\strunk\senhancements.
- D 2017-02-04T15:29:05.790
- F Makefile.in 3fc65e1d80b5937998f15f7e4c97ee6471e291a4
 -C Always\sinvoke\sthe\sxRoundup()\smethod\sof\sthe\smemory\sallocator\sbefore\scalling\nxMalloc().
 -D 2017-02-08T16:01:57.242
 -F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
++C Merge\sthe\s3.17.0beta\schanges\sfrom\strunk.
++D 2017-02-08T16:55:29.013
++F Makefile.in 0c27f4cee5d1d12f3a8d8fa88500c7264d2f4b36
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc addccc6c5977519e9f1763e8923150932ad3ec24
 -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 f6aedbf77010aec17f8e50f46465046f6842571a
 -F ext/rtree/rtree.c d92be99e3a662e1934658201f0fc7ad51b44325a
++F ext/rtree/rtree.c e83711f6f7bade2972a7b5ed2df34e6df5cafe33
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -308,19 -309,16 +309,19 @@@ F ext/session/sessionat.test b25d61d663
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
- F ext/session/sqlite3session.c c61a43396368ec00dc127f7bc647e9bd6a4ee5fb
- F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2
+ F ext/session/sqlite3session.c 13642d9c754cc18f17e141f82860d269e2adf920
+ F ext/session/sqlite3session.h d4db650adfcc7a4360e9f12a09c2d117b1db6b53
  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 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk f5ae2a0ddfe215ac23a9c1384e56a16b108e84f9
 -F main.mk 08e0b151abb46353c677ac4974b50c6077f85eee
++F main.mk 83913b36dafe750eb9c764bf2dba61c3aa8d3ee5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -359,12 -357,12 +360,12 @@@ 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 fc1b9f445290f2145da48fc08730c26e6082b640
+ F src/malloc.c dc2b84cd320e0498ef4209772d66f353df6e4eb2
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
+ F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
  F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
@@@ -638,9 -635,10 +639,10 @@@ F test/ctime.test a4effbe5472ef6c0308c4
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
  F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
- F test/dbfuzz.c 8cc2bdb818b4483a052f9f80f96be74cbd9a6e1d
+ F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
+ F test/dbselftest.c b2e6cfac59066dbcb7334b66304bb15a5508dd42
  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
@@@ -851,13 -849,13 +853,13 @@@ F test/in4.test d2b38cba404bc4320f4fe1b
  F test/in5.test 6c006e0bcd7351b69350ef566e65f244023489e9
  F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
  F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
  F test/incrblob4.test 21a52a6843a56cdcce968c6a86b72a7066d0e6ba
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
- F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
+ F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 -F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
 +F test/incrvacuum2.test 1e873b6caf87ce160d4cb6d8c7a46f0570da1ddc
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test fe3c7a1aad82af92623747e9c3f3aa94ccd51238
@@@ -1015,14 -1012,14 +1017,14 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test cd0b7bc04bf5e50d3a993d24c834d591f7d4f5fe
+ F test/permutations.test 46ad98770d3c04ce2418cab2cc527647bfe961a7
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
 -F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
 +F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1172,7 -1169,7 +1174,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl da51aaf82a0287aad07753dede0f428ed487bb41
 -F test/tester.tcl 67835ac17e90055f24a9cf52e5c5bce0dd511c74
++F test/tester.tcl ea01a5b6111fda62857d092b128e0d890049e6ed
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1498,8 -1496,8 +1501,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl ebb4bfcd2f8010e0a3934b6118db4b5f2f5edf5c
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
- F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249
+ F tool/mksqlite3h.tcl b9836752c3d08f9fab2dfc0017ca9fd5d90ac863
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1557,7 -1555,7 +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 0e14fe1b986abf1449d727fbe04c6a939ed209a2 97ccf3e4de11ffea46993cb7fb7ab559b9810705
- R b5759eefd636bb3b436e5984cb592ce8
 -P c46e06fab4465128ac3364bafef5fa3d016796d0
 -R 4a0a823e254c393eb2ca1b8aee7648b4
++P 6c3f09028f070b2612c00466ec3f01e2098b818d 77b470b0df73dc5ae5ad2f0170ef7c50558c7c88
++R e76a98ec256b3e98892f5d07f7155185
  U drh
- Z 01a7e171c20aabda2c860608e811721c
 -Z f41f90df67587790eae7117dc459eaeb
++Z 912871f8ba2eca56d5dc14e65b128592

diff --cc manifest.uuid
index 8c2ce8fdd9dbd0461a023678c648fc3cc91a6d7b,e1604708ad050491bd1aa87e93a5e42ca6bfd74f..adb1b14c86f37154368362fe3e7b01eeaddc4ff7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6c3f09028f070b2612c00466ec3f01e2098b818d
 -77b470b0df73dc5ae5ad2f0170ef7c50558c7c88
++92dbd8753eb399f8e377ecd1f0805b606ee6fce9

diff --cc test/tester.tcl
Simple merge