Merge enhancements from trunk.

FossilOrigin-Name: 29570a604806e2a60a8eef7eaf1dce022d2a7004

diff --cc manifest
index 27b1b39c5203e4ddee81f3d7653c79fa4647780b,cb2ed488589cc3abe38a247ead89132c5988601d..168ed0627a6cd70441ec792ae4e94045498235e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\senhancements\sfrom\strunk,\sincluding\stable-valued\sexpressions.
- D 2015-08-20T23:45:59.168
 -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\senhancements\sfrom\strunk.
++D 2015-09-01T18:31:19.659
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
+ F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
+ F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -278,19 -279,19 +279,19 @@@ 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.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 +F src/btree.c b8083a37c09df6a30af497086d7ba05c1526d359
 +F src/btree.h 6310645beddbd3eef89fa9b6d1062065976a93c8
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 5eb5d055a1d1cdaaea25e01b12607aa894bc0911
+ F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f
  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 8857a6f27560718f65d43bdbec86c967ae1f8dfa
- F src/expr.c 673b80a52bbd6baedef15353c22facc436634fe8
+ F src/delete.c 813be7b5659d7658c8a71b5ae194b45c8f739c8b
 -F src/expr.c 5944e529891416f482250e16c598d8c26e149eb0
++F src/expr.c 6814e926d92b8e99ed422193341b89f5cb8d0f87
  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
@@@ -334,14 -335,14 +335,14 @@@ 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 4f276673f843f80e4db710556fefcede84527b86
- F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
- F src/sqlite.h.in 447ead0a6b3293206f04a0896553955d07cfb4b9
 -F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
++F src/select.c 3f588e05027cdb1a0b27ed305038d1449657b31d
+ F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
+ F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h a0b948ebc89bac13941254641326a6aa248c2cc4
- F src/sqliteInt.h 58bae1ab01e341359e0674a6e45304eb07c0c460
+ F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
++F src/sqliteInt.h c452759fafe7d6ed9bbdfec19d327a2b77e85d2e
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -410,13 -411,13 +411,13 @@@ F src/vdbesort.c f5009e7a35e3065635d891
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
+ F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 746317b80f377aafbfb6c5e01366dedc38e1255b
- F src/whereInt.h 880a8599226ac1c00203490d934f3ed79b292572
- F src/wherecode.c 3be7fd91b356fad4379ad1cc98929e22c19c1acb
- F src/whereexpr.c f9dbd159127452150c92b558e184827ecb8f9229
 -F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
++F src/where.c 5efdfbfade7392dbe0849b41af3550bc5de0a923
+ F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
 -F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
++F src/wherecode.c a9b88cb2973947a11ca80d04f2db30d46f8d6853
+ F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1377,7 -1380,7 +1381,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 b5897bc0f003c470eeb2a75e0a2b2bb202681531 64d13339d44d1b7ec6768a33421f2138cb7872d8
- R 9b0937bd5d11dff99a3e5d1003be4f97
 -P 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
 -R e2bf483acb1667e13821f8d776f13acb
++P b9927c876c1d4e146cb6a603d82cd2489594084d 1da60c3dda4254620052a83c853c2d2b6dd5009f
++R 3e1b1bd77195e09164f187ec59686181
  U drh
- Z 8c2c018336c0b229ac2e1ad26fa5ec97
 -Z ec66207700973851a4a5019af1bd75d1
++Z 804082d677813b1dfe48fd23d37aae84

diff --cc manifest.uuid
index ef28417b4c55b753cf25f48bc5a7e1c9320a9a99,17d2b0dd8c4dc014b485020eb84a22f9d99cb184..935322d5f896956185537d4b9cba912edb5c7002
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b9927c876c1d4e146cb6a603d82cd2489594084d
 -1da60c3dda4254620052a83c853c2d2b6dd5009f
++29570a604806e2a60a8eef7eaf1dce022d2a7004

diff --cc src/expr.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge

diff --cc src/wherecode.c
Simple merge