Merge latest trunk changes with this branch.

FossilOrigin-Name: b5f0e8c5b4bc018d672617ffd342d12b228548b9

diff --cc main.mk
Simple merge

diff --cc manifest
index 78e665497d67c75a54fc55525a838d58e27c7425,0c5a5294e3b04b9bc7259cf3c60a13ee83cb8756..2af27f7119f78331c30ee0d2ff03bcc7cf1e5a5d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Change\sfts5\sdoclist-index\sstructures\sto\sbe\strees\sinstead\sof\sflat\slists.\sThis\sonly\smakes\sa\sdifference\sfor\sdatabases\sthat\scontain\smillions\sof\sinstances\sof\sthe\ssame\stoken.
- D 2015-05-13T17:15:32.981
 -C Enhancements\sto\sthe\sMSVC\smakefile.
 -D 2015-05-13T04:50:30.732
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-05-13T18:12:58.028
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 31b38b9da2e4b36f54a013bd71a5c3f6e45ca78f
+ F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 4a546e42ecfd0fe53c31e05c2a965e17fb591637
+ F Makefile.msc a9fd7fd02265aa5b3b2522f5e39d975972ff906d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
+ F VERSION 8af05c43e00f7de32be74ff9984d792c96cdb0de
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -78,11 -78,11 +78,11 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 81f9ed55ad58614828ad9d8b1e0525ad78fede1b
+ F ext/fts3/fts3.c 341e9d9a3c7615bac8e815a8937d576265b22f78
 -F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 +F ext/fts3/fts3.h 62a77d880cf06a2865052726f8325c8fabcecad7
- F ext/fts3/fts3Int.h 3626655d6ba903a3919bb44e1c38e5f0f9d6be82
- F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
- F ext/fts3/fts3_expr.c 40123785eaa3ebd4c45c9b23407cc44ac0c49905
+ F ext/fts3/fts3Int.h 142837a7544dff49121b67091a71c4f7a4546b0f
+ F ext/fts3/fts3_aux.c 9edc3655fcb287f0467d0a4b886a01c6185fe9f1
+ F ext/fts3/fts3_expr.c 71c063da9c2a4167fb54aec089dd5ef33a58c9cb
  F ext/fts3/fts3_hash.c 29b986e43f4e9dd40110eafa377dc0d63c422c60
  F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
  F ext/fts3/fts3_icu.c e319e108661147bcca8dd511cd562f33a1ba81b5
@@@ -217,7 -152,7 +217,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 063cdc009247a9b543875ea12f4e27b8f3bcca54
 -F main.mk d49723483ee9e4fb71dc2bd0e6be58705a481e73
++F main.mk a17ff4be35788f0a007b80af5e2a4f3036f03882
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -236,21 -171,22 +236,22 @@@ F src/analyze.c d23790787f80ebed58df777
  F src/attach.c c38ac5a520a231d5d0308fd7f2ad95191c867bae
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
- F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
+ F src/bitvec.c 5eb7958c3bf65210211cbcfc44eff86d0ded7c9d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 127aceb71ba93f59bc9c6ba810e992a04299e98a
+ F src/btree.c 30a80340481098d699398cba3536c895373b2e2c
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c e246c2cea69c8f6fc825a156ea2de9dd4a17f18b
+ F src/build.c 61b47073f79f31e80a05db9ce13c5ca81bf8f74e
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
- F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
+ F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
++F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a w src/test_stat.c
  F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
- F src/expr.c 4c05a28eebe63b288fda1db0e8de556a82ca2ec6
+ F src/expr.c 3fb2ab3ab69d15b4b75ae53fceb4e317f64cb306
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
- F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
+ F src/func.c 5b8b8e77a0fb644eaf8947d413804622e32692b6
  F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -259,9 -195,9 +260,9 @@@ F src/insert.c 8176ba5bad8fcef643558ca5
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
- F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c 43cb916046dc9dfde761380a764190a4a4223bc6
- F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
+ F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271
 -F src/main.c bf14bc6a321965e528d8ab30087e9440335f2e4b
++F src/main.c 35fe70009ee313c5535194695ca4182bda15a2de
+ F src/malloc.c 5bc15d525811d387b37c29f2e368143460e41e96
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -291,21 -227,21 +292,21 @@@ F src/pcache1.c 69d137620a305f814398bd2
  F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
- F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
+ F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
+ F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
- F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
- F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
+ F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
+ F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
+ F src/sqlite.h.in bf3fe5eba3a5142477b8dae3cfce627c3e971455
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece
+ F src/sqliteInt.h c9f77bd02f419dcc8c644c5032c42eb29069a545
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
- F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 3d89752d9a58039c2e82412a85387fe49eec6f72
- F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
+ F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c 9111a95999edac92229c972e2c34fbc171bbb6c5
++F src/tclsqlite.c 47f303d6572a3c01700d5e57ea04f8833bd8059b
+ F src/test1.c a8e09b811f70184ce65012f27f30cfee7e54f268
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -317,9 -253,9 +318,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
+ F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03
 +F src/test_config.c ca734889a4ece295d3ed129dc532f7fefc63711d
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -364,15 -299,15 +364,15 @@@ F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
  F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c b5256445b318b0f2b3bc429028469cfbb08f19a5
- F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
- F src/vtab.c fcbf338e0e8a91906aaf24bda8120e9f00cb4576
+ F src/vdbemem.c 7bfbeef0978a2e1a05d979641fdbf7c189b7ddf4
+ F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
 -F src/vtab.c c535e80259ebe616467181a83a4263555b97c694
++F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
+ F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 32fe265e3dc74ef3b27deb9e6eb5fc3c71409612
+ F src/where.c 85fff9c40569ccb79c3177419b339e7d7df566cb
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1284,7 -1223,7 +1289,7 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
- F tool/mksqlite3c.tcl eea6aa21d76f47c7932af2baa9291517ec72f5ce
 -F tool/mksqlite3c.tcl 10c06c9c616415c0269c13a33304a75e3c319c3f
++F tool/mksqlite3c.tcl ddd1ab091b2b42cf5cef07db5003b4c88272754e
  F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1
@@@ -1319,7 -1258,7 +1324,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3922276135a7825d0ede8d9c757e9cfe492f803a
- R 80fc221c857ceeffac4c1ca1e8e3c4c0
 -P b33f1bacfdb34fe66b7b073e68bfac38498d6e88
 -R 786cf9bafb843a30daaea508385a36b1
 -U mistachkin
 -Z cf0d8cd171ac487c0fd87c289759c254
++P aa34bf666c384cf32a8d8166ab6d9afbca26a256 59e3e9e764440b7feaafadff74f422535d21bca2
++R 7fb50d1391be18153fa78235920902bf
 +U dan
- Z ea2587087e805cefd8e74a1d1357bdd2
++Z 5ed330406879741f67800dc0f7082030

diff --cc manifest.uuid
index 3338b019bbe33fcb747eccdd1a9d9405cd974f1a,af09740391caad5f8097efb6a468eab85473077d..a27ca1b1128b01fd3452dae5e86d38f1468dbb09
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa34bf666c384cf32a8d8166ab6d9afbca26a256
 -59e3e9e764440b7feaafadff74f422535d21bca2
++b5f0e8c5b4bc018d672617ffd342d12b228548b9

diff --cc src/main.c
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/vtab.c
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge