Merge recent enhancements from trunk.

FossilOrigin-Name: cb77236673e30af1e8749d984dedecc8f901b255

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
index 4e4e226c5339b506cae515ad72db0283766f9860,7cc09d6c8ddfe6e11a2937429fc52591734d8705..03d5473bea9483c1bced2cb38ac2aa81fcecfdef
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -73,10 -72,7 +73,8 @@@ LIBOBJ+= vdbe.o parse.o 
         vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
           utf.o vtab.o
  
 +LIBOBJ += sqlite3session.o
  
- LIBOBJ += fts5.o
- 
  # All of the source code files.
  #
  SRC = \

diff --cc manifest
index 72c7b00892e236666092fec4e9d0ba47a1516f0a,cb2ed488589cc3abe38a247ead89132c5988601d..3faf32a87b1b2da86a660c1fafa6f4264d16adf5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\senhancements,\sinclude\stable-valued\sfunctions.
- D 2015-08-20T23:54:25.007
 -C Enhance\sthe\sjson_extract()\sfunction\sso\sthat\sif\sgiven\smultiple\sPATH\sarguments\nit\swill\sreturn\sa\sJSON\sarray\swith\sall\sof\sthe\sanswers.\s\sAlso\supdate\scomments\nwithin\sthe\sjson1\sextension\sto\sreflect\sstricter\sinterpretation\sof\sJSON\sand\sPATH\narguments.
 -D 2015-08-29T19:41:45.279
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2015-09-01T18:52:35.271
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 7c77beda9c1e956ff754ff12141b4b2ed033686b
 -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
++F Makefile.in 00b690660681c22e7ce3a9cbebd69894766ebbd8
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc e978ec57e8eb6e2f5b8a5114fa8cb320626337ca
 -F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
++F Makefile.msc a71cfab97780281290f01b212f907d6d438b7e2d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -276,7 -258,7 +277,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2d090a509da78d5dde9da7062ff0c104a4bb3023
 -F main.mk 8da13ed011a7ae19450b7554910ff4afa3bd22b7
++F main.mk be6f386422ef2d203455cd8b0b7aef148a881718
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -306,16 -288,16 +307,16 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
  F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
- F src/delete.c b998fbc3c55e8331a5f40aa7ff80972254de8de1
- F src/expr.c 9b9fa7f825290dee945007edc9fe8fdd9b8ce49e
 -F src/delete.c 813be7b5659d7658c8a71b5ae194b45c8f739c8b
++F src/delete.c 6ecf6e84ad3013adbc996c3fe1b77d5f72f36562
+ F src/expr.c 5944e529891416f482250e16c598d8c26e149eb0
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c c9b63a217d86582c22121699a47f22f524608869
+ F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
  F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 43e48fa63c9b9b5f195a13c40ddf7fd112370bb2
 -F src/insert.c c31b9253f0d40425d012701ba6e7e4b28c1676ea
++F src/insert.c 9301b3ddffa1d9f14e6e750b26d5cc86fb028831
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
@@@ -353,19 -335,19 +354,19 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 7a67cd2aebc9a9eeecd1d104eb6a9237388eb452
+ F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c c46de38c1b66355f02a839bb72eb13f277e6d19c
- F src/shell.c 534f332318f1cff781e07d82a952f22e644e8f6f
- F src/sqlite.h.in a25d949fd0714136d574e18738defa893baf14bb
+ F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
 -F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
 -F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
++F src/shell.c af164c3e8c5d187305fb9187f3b6dd7618aa5726
++F src/sqlite.h.in 4afdc59b5e5cc9938107144997153a812aa8b5ca
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
- F src/sqliteInt.h 198917e2122c33b43412efedc2b055a82a212225
+ F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
++F src/sqliteInt.h 5dda67f9d2d2a2ada0d28d59b7d18a510aa61942
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c c12ed85c22ac95f87f79de2ec9553334d115f71e
+ F src/test1.c c96508c835979bf15dc0e3146e2c7a51a2333d3c
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -412,9 -394,9 +413,9 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c c15df00728034549ff92d78ae851b44952736d3b
+ F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
 -F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
++F src/update.c b551ee2dadf47b34312a5cfb5a7139ead3d47bc5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
@@@ -1396,7 -1380,7 +1400,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 0298a9a780695b666e7c683700d9f2f889d6f826 64d13339d44d1b7ec6768a33421f2138cb7872d8
- R 68454f4230fc116d30b90969f8a680d7
 -P 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
 -R e2bf483acb1667e13821f8d776f13acb
++P e9196d566690de0e9815f8cd85be7844322b5a79 1da60c3dda4254620052a83c853c2d2b6dd5009f
++R f39b8d67fa472811f667c334c4e1ce72
  U drh
- Z c9e6b5cac5d4ca7f98b94a1f656dcb53
 -Z ec66207700973851a4a5019af1bd75d1
++Z 760ecb4a8ede1ee2af06746289d94396

diff --cc manifest.uuid
index 7c89602550a983f8a9785eb97a940f7d49c95ccf,17d2b0dd8c4dc014b485020eb84a22f9d99cb184..21438e78331c5bd2cea8f769d32d839549bbcf20
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e9196d566690de0e9815f8cd85be7844322b5a79
 -1da60c3dda4254620052a83c853c2d2b6dd5009f
++cb77236673e30af1e8749d984dedecc8f901b255

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