Merge the latest trunk enhancements.

FossilOrigin-Name: 4af79477fd1c156bc31c397117a85ae72c286fe2

diff --cc Makefile.in
index ba0e6411624016b5fa17ad861315f095e29d0780,99af3e44e52cee6c98aeef27d3ccbc72292fa647..2352ebc4f588f442fb629d27831124cc239e007f
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -575,12 -562,13 +575,12 @@@ libsqlite3.la:  $(LIBOBJ
  libtclsqlite3.la:     tclsqlite.lo libsqlite3.la
        $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
                libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
 -              -rpath "$(TCLLIBDIR)" \
 -              -version-info "8:6:8" \
 -              -avoid-version
 +                -rpath "$(TCLLIBDIR)/sqlite3" \
 +              -version-info "8:6:8"
  
- sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h
-       $(LTLINK) $(READLINE_FLAGS) \
-               -o $@ $(TOP)/src/shell.c libsqlite3.la \
+ sqlite3$(TEXE):       $(TOP)/src/shell.c libsqlite3.la sqlite3.h $(TOP)/ext/misc/json1.c
+       $(LTLINK) $(READLINE_FLAGS) -DSQLITE_ENABLE_JSON1 -o $@ \
+               $(TOP)/src/shell.c $(TOP)/ext/misc/json1.c libsqlite3.la \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
  
  sqldiff$(TEXE):       $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h

diff --cc main.mk
Simple merge

diff --cc manifest
index 31363a2e96e69c2ee28772630ae67bc87c2d922f,cb2ed488589cc3abe38a247ead89132c5988601d..a85c6134bc49f27377172d3445146df3d33d0afa
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\spotential\ssegfault\sin\sthe\sVFS\slogic\sthat\schecks\sfor\sfail\srenames\sout\nfrom\sunder\sSQLite.
- D 2015-08-28T15:35:30.777
 -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\sthe\slatest\strunk\senhancements.
++D 2015-09-01T18:40:52.737
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in fbef0c6d0c4d58e7c0983d1c3a789bbe3b20dc81
 -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
++F Makefile.in 3d5c779460045b6fcc3179f46c27c4ab8716a189
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
+ F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -261,7 -258,7 +261,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk bb8d31b53e1956ea7571bea3318217f0ca5c7544
 -F main.mk 8da13ed011a7ae19450b7554910ff4afa3bd22b7
++F main.mk 9870f0c839bf9e97f3a8578ae5868b9026221754
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -282,10 -279,10 +282,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
 +F src/btree.c d82a50a60222073786f21d1f93dd95d5718f0659
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 97f682229876834abad515a0a48759a967999ed0
+ F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -341,12 -338,11 +341,12 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
- F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
+ F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
 -F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
 +F src/sqlite.h.in 2dc1df9ca9e551aa54f3cd9ca65273e879cc832d
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
 +F src/sqliteInt.h 680a0371a53bf46a2ad795e4ef3ccf2df702a1b8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -415,8 -411,8 +415,8 @@@ F src/vdbesort.c f5009e7a35e3065635d891
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 22a901a0af4bf896ae4053023b1fe881e67f71a7
 -F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c d973cff4571083ffb044c0bf4b69a27ca4b453b4
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
  F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
  F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
@@@ -1264,33 -1259,33 +1264,33 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 2b5445e5da44780b9b44712f5a38523f7aeb0941
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test d7d2f20a26f0277b22f96cd631cd13d23e0545c9
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
- F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
++F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 1ff3d9f8da0a6c0dc5ccfd38d9225b2cdb5b6afb
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1385,7 -1380,7 +1385,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 bd911496cb2343d9640c131d905c9f0bee8fc428
- R 98a4f87f6749b2b3414cd856e8af931e
 -P 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
 -R e2bf483acb1667e13821f8d776f13acb
++P 650111f66721c33015f89cda4f5afcb6e0dc1643 1da60c3dda4254620052a83c853c2d2b6dd5009f
++R 33b5f1d35d4a1d00c8978f4497176fb5
  U drh
- Z d901d81dcf678e36a8e33c11812867cb
 -Z ec66207700973851a4a5019af1bd75d1
++Z f2b555f2b9d4d5b5ce89faa6e40e5698

diff --cc manifest.uuid
index e21956ad9a94fb876281ec29ec32fd38af314dea,17d2b0dd8c4dc014b485020eb84a22f9d99cb184..b0606051261ac5dbab74d92978965c1fcf7cd1a6
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 650111f66721c33015f89cda4f5afcb6e0dc1643
 -1da60c3dda4254620052a83c853c2d2b6dd5009f
++4af79477fd1c156bc31c397117a85ae72c286fe2

diff --cc src/wal.c
Simple merge

diff --cc test/wal6.test
Simple merge