Merge the latest trunk enhancements.

FossilOrigin-Name: 22ce9218fb2bb56cc5dd4e32077a16f669250d5f

diff --cc main.mk
index 03d5473bea9483c1bced2cb38ac2aa81fcecfdef,3668c84321e4faef05c23597d7d8bb2c16f53043..7b42c0bfbd0d73d6a085557b1c4490a095652282
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -47,7 -47,7 +47,8 @@@
  TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) 
  TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
  TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
 +TCCX += -I$(TOP)/ext/session
+ TCCX += -I$(TOP)/ext/fts5
  
  # Object files for the SQLite library.
  #

diff --cc manifest
index 0fa6ac3177befbb6ea79fe7db08c20bbdfed0ad4,7d3bf391d280d0eae5f52e82b0ec11eeaeaf9908..6565432a3a4bf52c2120b70f939c181921e3141e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\senhancements.
- D 2015-09-03T14:48:25.922
 -C Add\sstatic\sVFS\smutexes\sto\sthe\sprimary\sheader\sfile\scomments.
 -D 2015-09-13T20:15:01.158
++C Merge\sthe\slatest\strunk\senhancements.
++D 2015-09-14T10:47:29.524
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 +F Makefile.in 00b690660681c22e7ce3a9cbebd69894766ebbd8
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
 +F Makefile.msc a71cfab97780281290f01b212f907d6d438b7e2d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -277,7 -261,7 +280,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk be6f386422ef2d203455cd8b0b7aef148a881718
 -F main.mk 58eb74de702467c3b71cdf06f213cefe7f5ce544
++F main.mk ffd9a2beb9583da4c54fcd811daf4c770bf9bcfe
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -305,24 -289,24 +308,24 @@@ F src/build.c f81380bc4d5d239c18b42982a
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
- F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
- F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c 8dbf37c9f81cf4ba8f59d3dc631b6fb4b09a89c3
- F src/expr.c af2c72f8938413c0c367554962b0d8761121f39d
+ F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
+ F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
 -F src/delete.c 6792c80d7fb54c4df9f7680413952600e7439492
++F src/delete.c 7949fe60607686f3e359ae513d999d7be9ef8451
+ F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
- F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
+ F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b7e0cdf50328870f8a1cacb3ba89daf305b90441
 -F src/insert.c 076dc5876e261a9908603d54cfc5344cd680166c
++F src/insert.c 19b8749cbf1160918ed3e54c0e0e130c8ee2d0f3
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
- F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
- F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
+ F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
+ F src/loadext.c f0b66d28e377fd6c6d36cc9d92df1ff251ebee44
 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54
 +F src/main.c 9e2e596c97401a7b99f2f500f5e2c725d53eabe2
- F src/malloc.c 021012e28a81ffdabf4c30ec3df6ce1f6cc93f1d
+ F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -354,14 -338,14 +357,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
+ F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
- F src/shell.c af164c3e8c5d187305fb9187f3b6dd7618aa5726
- F src/sqlite.h.in 4afdc59b5e5cc9938107144997153a812aa8b5ca
 -F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
 -F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
++F src/shell.c 2b29a6f5c1b431eb0d25196e249d7e69b68d5ef0
++F src/sqlite.h.in 6ee38de04d4836a0a5171482aa1655eb70aa4ff9
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 5dda67f9d2d2a2ada0d28d59b7d18a510aa61942
+ F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h b3e590f374b376a793b93e2387b8d5aca0fc92c4
++F src/sqliteInt.h 6376e8f55360a1495f2141add001d07875a98f32
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -412,20 -396,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 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
+ F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
+ F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 352eb0f1f32421cf5f276a2301172a99a49181d1
 -F src/update.c 3c5bc9570df3bfafa0db36828406a8a14e4c426e
++F src/update.c ce5157218efb9b6412ca9a7536ce0eff1c9b8a72
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 -F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 -F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
 -F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
 +F src/vdbe.c 76304f37d020d217ee6cfd3ac632fb4e6fcddb26
 +F src/vdbe.h 67151895e779b35475c6c11b16be2ceb839066c8
- F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
- F src/vdbeapi.c c58b0f5aab970e190b1047c4c6b74769381dcd04
++F src/vdbeInt.h 42fa34502937071aabd3c0596575ba9776547353
++F src/vdbeapi.c 82973abfc02aaba46ec1020423ffcee66665ee45
 +F src/vdbeaux.c 4cbd4cc79dad0e2c2b9996ae018d79a7330110f4
- F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
- F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
++F src/vdbeblob.c 53ed7f38ab93922038bcfa17aae514dc47752f1e
++F src/vdbemem.c 28ab8455ac490373798cf2c21def2c1287942551
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
@@@ -640,8 -624,8 +643,8 @@@ F test/fkey1.test de5b287f6a480b36bd51e
  F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
- F test/fkey5.test 56bcb5a6e8b725b17febc267fb041a6695e86853
+ 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/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749
@@@ -934,9 -920,9 +939,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 ac3b00c299250cc087d4a527b5c75a0f8aef4e54
 +F test/permutations.test c57b8fa360f3b86385fc03f9b25160b5fdfbcb51
- F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
- F test/pragma2.test 8e72df3a16c0fda748ad52abf79cb8256b04a6fe
+ F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
+ F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1055,11 -1041,11 +1061,11 @@@ F test/superlock.test 1cde669f68d2dd37d
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
  F test/syscall.test d2fdaad713f103ac611fe7ef9b724c7b69f8149c
  F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6
- F test/tabfunc01.test a12eba3f48a03a6626f985734ecc28132381fa9b
- F test/table.test 33bf0d1fd07f304582695184b8e6feb017303816
+ F test/tabfunc01.test fa9d8dfc75747019e0be98d3b6ac68d18632d328
+ F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 -F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 +F test/tclsqlite.test 7179b4e0bf236ddf0bfa6bfaefa76fbe0a23c28a
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
@@@ -1400,7 -1386,7 +1406,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cb77236673e30af1e8749d984dedecc8f901b255 847387ec8e6fef283899578fb232b2c23b00ee5b
- R 3067aa3f36091d5700863465d026f2a3
 -P 786333e05a75406bbd0b5c9c7beb8f16022eabec
 -R 1a3f3f98d74800359cb14e46ec6e0053
 -U mistachkin
 -Z 7262f2bc6346d75912550091a71aa522
++P 6a513c05850949900f396c7a61accb97cc6d2af5 9a867d9fbe74fe2b33d55e32737a66e9a77b7466
++R 13a4fce04942a61d26f4e958ede5b588
 +U drh
- Z ab63c2ebd89dcf93f54b64f43853b54b
++Z 990fce3de452a73c29793e828eabdda7

diff --cc manifest.uuid
index fc1eda7cd120670e35ffe2b429d68bea0145cad2,671ed1e6ca8b423ecb684bb8543034988e72ae09..6f4abdf48b07f20a787d515269f74455f175b3a5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6a513c05850949900f396c7a61accb97cc6d2af5
 -9a867d9fbe74fe2b33d55e32737a66e9a77b7466
++22ce9218fb2bb56cc5dd4e32077a16f669250d5f

diff --cc src/delete.c
Simple merge

diff --cc src/insert.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/update.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge

diff --cc src/vdbemem.c
Simple merge