Merge enhancements and fixes from trunk.

FossilOrigin-Name: f040a5bb62f3473fba6450c97c68f538d1df21ef

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index 0a0a99f0ba5c07f2bb6b2616327ad2d5497d92a2,9620ff62375e050d49452a38e827913b7588c6b9..4ffe5c3620cae292e6cd2a1cdd2ff184e442a1fd
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -2041,9 -2044,8 +2076,9 @@@ clean
        del /Q testloadext.dll 2>NUL
        del /Q testfixture.exe test.db 2>NUL
        del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe 2>NUL
 +      del /Q changeset.exe 2>NUL
        del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe 2>NUL
-       del /Q mptester.exe wordcount.exe rbu.exe 2>NUL
+       del /Q mptester.exe wordcount.exe rbu.exe srcck1.exe 2>NUL
        del /Q $(SQLITE3EXE) $(SQLITE3DLL) sqlite3.def 2>NUL
        del /Q sqlite3.c sqlite3-*.c 2>NUL
        del /Q sqlite3rc.h 2>NUL

diff --cc main.mk
Simple merge

diff --cc manifest
index 8ad6e5d2fcf925508cba52e73b0b66793a69e3f9,69b6e1ba9ff3d54c67f04829d44e5a36e924fe99..50a3a7d14f6cac5d0969019aa9aaf475f47fa612
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2016-02-05T14:15:34.907
- F Makefile.in b12720a3957eb741a77a41d3412745b80ac3fa5d
 -C Make\ssure\severy\sco-routines\shas\sits\sown\sset\sof\stemporary\sregisters\sand\sdoes\nnot\sshare\stemporaries,\ssince\sa\sco-routine\smight\sexpect\sthe\scontent\sof\sa\ntemporary\sregister\sto\sbe\spreserved\sacross\san\sOP_Yield.\nProposed\sfix\sfor\sticket\s[d06a25c84454a].
 -D 2016-02-09T02:12:20.490
 -F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
++C Merge\senhancements\sand\sfixes\sfrom\strunk.
++D 2016-02-09T15:44:18.735
++F Makefile.in f3616d877a83bca632307d8acd1d2247a462c6dd
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc c6dfe4708e38482130e3ccc374be6d5ca4aeb26e
 -F Makefile.msc b0493f10caddb8adf992a4e6f1943141fc7c6816
++F Makefile.msc 8bab27a620b140c06014463b5d0829b052073d02
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -292,7 -272,7 +292,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 9a8522feb55a25b14024ff749079fb470fe77acb
 -F main.mk 37497b06d3e3acb2c71675d76627a3b2639c6db0
++F main.mk 21ff7c0fda5d0fade28e9ac2dff3e28097180528
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -329,12 -309,12 +329,12 @@@ F src/global.c bd5a0af3f30b0c01be6db756
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 0c96c4f1caa18948484f8f2e229d7af9b8b4e25f
 -F src/insert.c 046199e085e69e05af7bef197d53c5b4b402b6fa
++F src/insert.c 76e3c2ffc598b7815e6a88b09b32416e1b1819fb
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
  F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
- F src/main.c 988a73bf14251ab9c4e1ad8743aa651bd713bea2
- F src/malloc.c 55ebb1701ebd39985dbcc497aaecb09192b69682
 -F src/main.c b67a45397b93b7ba8fbd6bfcb03423d245baed05
++F src/main.c 411d1dbe085a45f323e3bd8fed91da06cedb4c3b
+ F src/malloc.c 337e9808b5231855fe28857950f4f60ae42c417f
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -368,12 -348,12 +368,12 @@@ F src/printf.c 63e6fb12bbe702dd664dc370
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 57646a44ba9a0bc4aa926ae9c79b8199c246844b
+ F src/select.c ff80004a9a6ece891a8d9327a88e7b6e2588ee6d
 -F src/shell.c dcd7a83645ef2a58ee9c6d0ea4714d877d7835c4
 -F src/sqlite.h.in cf22ad1d52dca2c9862d63833e581028119aab7e
 +F src/shell.c 01e109c27300379b1c35b254cd294cde635f0179
 +F src/sqlite.h.in 301c01f7c514cbb9ff5110889ea24e1a9715edac
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 -F src/sqliteInt.h 3aeaff9611acd790c8e76719b33db09ab885d537
 +F src/sqliteInt.h f58219ec2bae2458f2ead1c6e187646a3c70594a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -392,7 -372,7 +392,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c a0e8eeb86a7d9393f3bbf7315932c1cccd0e8010
 -F src/test_config.c 7985332c806d1cece793475c75a6abcccde9d331
++F src/test_config.c 1e51263265c5b78adca10fa204d1e6f164387a20
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c a61f54247fdb843761d709879c3bcd1989b2050c
@@@ -426,20 -406,20 +426,20 @@@ F src/test_windirent.c 8f5fada630348558
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 214b783d6138e9f9fbb6b225ce9a376db3b03d42
+ F src/tokenize.c 813934be70597edfbb685ae08fc4c8b549cf5a1e
  F src/treeview.c dc39ccf04e9331237388b9cb73289c9d87ea050b
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 -F src/update.c 310ca7adb86a7d1f2afae46905b21c83580f3e17
 +F src/update.c 52552d2fe1bb66e7bdaedbd68e7dda1f5705bd44
  F src/utf.c 10cc2519e82e3369344d0969ad4b1a333dc86d18
  F src/util.c 49ce0a65306c1c51d61cb5bc214c71cb62452de6
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c c193299e595a13eba247738e22fce25c49346a6c
 -F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
 -F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
 -F src/vdbeapi.c 9324f6baee1a1b2284c6543e98f916888a81e459
 -F src/vdbeaux.c deae5d3bd45da0e57c7d9e1d7436333d142dc3bb
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c 68fcfac37dc6601d98c32cc5adee4d39f2c1b7b4
 +F src/vdbe.c 830c927c64e477f86f33d806c585ab1904cf6e4e
- F src/vdbe.h 19162d5d75d00ee9e634ad630f2a873e1cf76359
++F src/vdbe.h 594aef1a7dcfc2944e2f266f148140c3427fd0f0
 +F src/vdbeInt.h 2a8796b099a463cf6c32514f8aa138d3b0c36b23
 +F src/vdbeapi.c f9bed48c23da6487fbe6648df45f340ccc199c4f
- F src/vdbeaux.c 456d0673ddced03335c8657af28eff4d13e54794
++F src/vdbeaux.c 520bf491dcf75ce8944c9486ac7e2fc68d1ea5a4
 +F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 +F src/vdbemem.c 36e2779132eaff83c7ed44d76340b8d2caab17cf
  F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c bef51b4f693d82b4b0184457faa8625654534091
@@@ -659,11 -639,11 +659,11 @@@ F test/fkey2.test f3d27ecba480a348c3289
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
  F test/fkey5.test 5a373303f201ac03c22ba1ef17a733d3f56e611a
 -F test/fkey6.test abb59f866c1b44926fd02d1fdd217d831fe04f48
 +F test/fkey6.test 6697550baa38505c9952eff130ab26a2d156c0cc
  F test/fkey7.test 72e915890ee4a005daaf3002cb208e8fe973ac13
- F test/fkey8.test 8f08203458321e6c19a263829de4cfc936274ab0
+ F test/fkey8.test 7bd1dd0174a0e29a90c62c517b9e2a410a0b345d
  F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749
- F test/fordelete.test 57ed9b953eeace09dd2eac3251b40bf9d6990aec
+ F test/fordelete.test eb93a2f34137bb87bdab88fcab06c0bd92719aff
  F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
  F test/fts-9fd058691.test 78b887e30ae6816df0e1fed6259de4b5a64ad33c
  F test/fts1a.test 46090311f85da51bb33bd5ce84f7948359c6d8d7
@@@ -964,9 -944,9 +964,9 @@@ F test/parser1.test 222b5cbf3e2e659fec1
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 382a43c49f49bafe6fddffe904ea33d6bb3ff33e
 +F test/permutations.test 74a48d89ce0d9ca8ad45a8f9f4bf66fa8bee0e34
  F test/pragma.test 507ac7ef2ea5682241ea0ef041799ca70bb5e0bf
- F test/pragma2.test a9400a7289605280576098b97f5cde3f204075c0
+ F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1026,10 -1006,9 +1026,10 @@@ F test/selectE.test a8730ca330fcf40ace1
  F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
  F test/selectG.test e8600e379589e85e9fefd2fe4d44a4cdd63f6982
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 +F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
  F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
- F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
+ F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
  F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
  F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
@@@ -1437,9 -1416,10 +1437,10 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/sqldiff.c 5a26205111e6fa856d9b1535b1637744dcdb930b
+ F tool/srcck1.c 4c39bdfa9a92edd20233ee720df84dbeb2417602
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.tcl 96022f35ada2194f6f8ccf6fd95809e90ed277c4
  F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
@@@ -1447,7 -1427,7 +1448,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f3f9200115caf4b356f90ec97c351d1afbcb9bf6 b082538da774ac77f284fd7e22f9b1b9c2abc343
- R caf89ffed359feebe1a7893788b9d4fd
 -P 6eab74c9ae57676044b5bc82fa14e92fd2448008
 -R 28a5285fd29b59b5a769fa2b98c8137d
++P a533608cb0de3cbc1e28a794aab99864b8c249f4 ca72be8618e5d466d6f35819ca8bbd2b84269959
++R d85e9a45ccd06fa00872d35eb5681210
  U drh
- Z 50b2b3cb434b1b40a7be12f42687aabd
 -Z 50a93197f1857fe46bad3c49957d1f43
++Z de0bc42fb2718aff4f759eb51f24bd2c

diff --cc manifest.uuid
index 70420107af48a5f39f04c30cb0eaca58ce4c68e3,9e7ed6ea0867335bed60efdec1b95d62d1fbbde9..a352e381f754ea7e84d7b5c6e9ab6e1d0dc8415d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a533608cb0de3cbc1e28a794aab99864b8c249f4
 -ca72be8618e5d466d6f35819ca8bbd2b84269959
++f040a5bb62f3473fba6450c97c68f538d1df21ef

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge