Merge the latest enhancements from trunk.

FossilOrigin-Name: 7d6cfc79e7e5534ebacd980479917bc528a638f7

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 701f0d01fcfab02d1f75f4f76ff08bdd186c3e08,d831f3f7cd780cd78ba84cd25f24072d2d1b351b..dfc4906ec6fd0509150e1e41933770135b8333ba
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sand\sbug\sfixes\sfrom\strunk.
- D 2015-11-07T01:33:30.741
- F Makefile.in 7037017983949da7c736ca3de2c3d29611b77d1c
 -C Fix\sproblems\swith\sthe\sway\sthe\sIsHiddenColumn()\smacro\sis\sdefined.
 -D 2015-11-19T18:11:20.451
 -F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
++C Merge\sthe\slatest\senhancements\sfrom\strunk.
++D 2015-11-19T19:40:40.385
++F Makefile.in c9dfc95717a5af63ab90b36f22afd11e865e3559
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 2ed14817d36a6c26cb146e53b9c8a7318ba5bdd4
 -F Makefile.msc e928e68168df69b353300ac87c10105206653a03
++F Makefile.msc 4f04d3dbe993b706c956509b1437559d7f2469b1
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -283,7 -263,7 +283,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2e67604b0dbd7670230ed626b6a2947f05a35ba5
 -F main.mk ae99be5eb22933b1ecf80f94d41d25a3ea80aaf3
++F main.mk 4f8d448adb9a7302cd5106f583ddc47067f1017d
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -311,7 -291,7 +311,7 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
- F src/delete.c 9dddc4434aace0f42f1ed1c5224cdcfc2328ed67
 -F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
++F src/delete.c 86e3940d07fe69a40270c2aaf6ca6c7adf19246c
  F src/expr.c 0080c0f12806eca91e75a23a121a68918e9da357
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
@@@ -320,12 -300,11 +320,11 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 0dbbde4b667b6e47a45ea98958516e2f30a9f9c4
 -F src/insert.c e1d20ae8979e25519c2670233718676bedcfedc9
++F src/insert.c 8ab83219eb56a103edb73bb0a1e9057c4d3b976b
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
- F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
  F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
- F src/main.c cae25642d7f49cd94d833c49726eeb28381349f0
 -F src/main.c 91feb5c7e393ad8f0c434754114a3493c3b0617a
++F src/main.c 59798e68b7f93eaf243b2b4d054dd4eb6ead907a
  F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -360,17 -339,17 +359,17 @@@ F src/printf.c f8fc8f04e75b1e983ef2793c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
- F src/shell.c 993863f82d764be0c00803056e56b9b744f86f02
- F src/sqlite.h.in 45821b35edf55ac410c16a3e1de4d6d43aa7ee16
+ F src/select.c 2376d320907a5c28c55290f18fd94aa3400bf97c
 -F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c
 -F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
++F src/shell.c 072fc3601b0ac02e50939b469fabeecfe3d66dcd
++F src/sqlite.h.in eed36953a0b5ce6c099b0cb2cb6b6ba220e6ca77
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h a02b33a3b68913394c218ec27f24b8fa33518244
 -F src/sqliteInt.h 25d0792e6d355a27975dc7c49c4514b3f6eb2294
++F src/sqliteInt.h d85782b8b5b2057ac015f7ec20195b7ce869960d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c a719afff3144f7f01c6dc3f7d118ac31d15e7527
+ F src/test1.c 4004bcc1b3b361a9137acd1d875599ecbdd6f961
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -384,7 -363,7 +383,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 e1fc48719655d83ea23513f3c3da32b4c4205899
 -F src/test_config.c f2824de39f59d8d621e2d6ec5cc67006d000b2eb
++F src/test_config.c a25edf31cc0dbe17f5d1d667b1320cbb4e52b6dd
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -416,20 -395,20 +415,20 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 338bc8f7c9dd103188952cda7964696bacac6d22
- F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
+ F src/tokenize.c 5606871a377f390af7040ec3c12e0d183512d785
+ F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 40e51cd0883cb5bfd6abb7d8a7cd8aa47fab2945
 +F src/update.c c2fff3b60bfcabcb0372acbe8cf6f77c2bb515bc
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 7a9b18027414368d800716e6319e2acd699c70db
 -F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c da9eddc62e025148e30267600a6fe3882d5e912f
 -F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
 -F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
 +F src/vdbe.c 9539aa0ccf4844b8b59466ef3c15dbffb479a390
 +F src/vdbe.h bfe3f80dba435377cdb64fd917f2529f0f48ab77
 +F src/vdbeInt.h d6ae6e64ad16e213f37306b1735ff72fb98bec69
 +F src/vdbeapi.c f5eda36a5c85ef578957ab4311e8d9b1f51a3552
- F src/vdbeaux.c 1c5969fa8b04e162a2e893ebb283071bec81a006
++F src/vdbeaux.c 67db9a1c132207f4d6a8f4e76531cea39539fcaa
 +F src/vdbeblob.c b400c25ac822af3c507ef84b5cd93c1583a70321
 +F src/vdbemem.c 25b6cfd665b5073480452426e84136edd94140c0
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
@@@ -783,7 -762,8 +782,8 @@@ F test/fuzzer1.test d4c52aaf3ef923da293
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
  F test/hexlit.test 1d312fa816dfd3650a3bb488093bc09a0c927f67
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
+ F test/hidden.test 23c1393a79e846d68fd902d72c85d5e5dcf98711
 +F test/hook.test aa41c095d26822b8a51aa4c82904a14347961be6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/ieee754.test 118b665a97a8df0e8f2fbdb07d113e596f4a6b53
  F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
@@@ -950,9 -930,9 +950,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 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 +F test/permutations.test 63cb93f915b4056463cef8ad035082e9f1cb524e
  F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
- F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
+ F test/pragma2.test 00065068eeab2d15ea55465ec0f1e0a70e2c369e
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1081,7 -1061,7 +1082,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl b1f0870442ca012effbf8659e34f9be428990696
 -F test/tester.tcl 9df86ab273a0877ffb4ec26c255166dcdca4c278
++F test/tester.tcl 24d971d001a5bb10ef13c27768caed182eb1566e
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1384,11 -1366,11 +1387,11 @@@ F tool/mkkeywordhash.c 06ec0b78bd4fa68c
  F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
  F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
+ F tool/mkpragmatab.tcl e94e55d247d4fe3be34f2a4f4edb03fdcd09ce5b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 -F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
 +F tool/mksqlite3c.tcl a52d7e8c0888f9384fbfa2c6ddd5f357409758b9
 +F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1410,10 -1393,10 +1414,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/sqldiff.c b318efc2eaf7a7fac4d281a0ce736193cb2506df
+ F tool/sqldiff.c db1232df457fdd4cbf2a919a497fc44bb18fb933
  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
@@@ -1421,7 -1404,7 +1425,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 0546d1cd1a3402890edade7970c269cc3f17bc98 0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
- R 65016c2c463ac04ecdb2d993caf6bb9d
 -P 13995756ad8b80568aa2f74387788a8cab1123ef
 -R 7d5fbb49b212de9edfd34eb075dc8992
++P 78bc42e664e9fa9ee21ad9762c369f291fcdf5db 126b998cf163dcdd5a222634f1e929f04db3c700
++R d78a5057451ca68f4e40e727fe9ca899
  U drh
- Z 6ef4d8405632dbe4f4eb27a0771bc5f1
 -Z bc25bafe8827ab2ba48c52405ca8c198
++Z 251138aef0997d710e6be89ddc7546bd

diff --cc manifest.uuid
index 5e3b708e1bc91be7ba0a598079a07a6be8dbcbaa,3e5e242be018e490c76c6031ca86513c4df878bb..77c3b5ff6578c1986447da6c1b600145513527ba
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 78bc42e664e9fa9ee21ad9762c369f291fcdf5db
 -126b998cf163dcdd5a222634f1e929f04db3c700
++7d6cfc79e7e5534ebacd980479917bc528a638f7

diff --cc src/delete.c
Simple merge

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/tester.tcl
Simple merge