Merge the latest enhancements from trunk.

FossilOrigin-Name: 7bde6d4d8cf05e1beb9bdf20b85760dc3e7a76c9

diff --cc manifest
index aab422faac3d8d3e8a07adb2cdf171e4ccd8d599,cb2ed488589cc3abe38a247ead89132c5988601d..5612003055aef1bb2b7028c2bcf3d9a7db20139b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sthe\sOR-optimization\sso\sthat\sit\salways\signores\ssubplans\sthat\sdo\snot\suse\san\sindex.
- D 2015-08-27T23:42:43.629
 -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\senhancements\sfrom\strunk.
++D 2015-08-31T14:27:29.928
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e2218eb228374422969de7b1680eda6864affcef
+ F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
+ F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -282,7 -282,7 +282,7 @@@ F src/btmutex.c 45a968cc85afed9b5e6cf55
  F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
- F src/build.c 6b7f6ccacd9cbd113f1948b4268cb81a87ee513a
 -F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f
++F src/build.c e0902658fc86dbd60a5c6772ca45429c69ee81fe
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -335,10 -335,10 +335,10 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 -F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
 +F src/resolve.c e6dc5a5490cf93afc1cc2cb58280c98da56acb3c
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
- F src/shell.c 5a08835e85c502978bde35a89d4045833f772876
 -F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3
++F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
@@@ -411,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 91e73ffc699c140a59baa03a6b7b060db02bed81
 -F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
 -F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
 -F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
 +F src/where.c acec45dc602a4f58e80e6fa088b9379ccfffd3a4
 +F src/whereInt.h 292d3ac90da4eab1e03ac8452f1add746bcafaa1
 +F src/wherecode.c b0bf45ca49e62fde68ba2e2ad2939d9cdeb4e409
 +F src/whereexpr.c 990ed42b5940d4000e7e61887a4bbed412c80488
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -942,7 -942,7 +942,7 @@@ F test/rollback2.test fc14cf6d1a2b250d2
  F test/rollbackfault.test 6a004f71087cc399296cffbb5429ea6da655ae65
  F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
- F test/rowid.test 09fcded0c96fbc0ed11fb75faa3b0bad32cb011a
 -F test/rowid.test 742b5741584a8a44fd83e856cc2896688401d645
++F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
  F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
  F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
  F test/savepoint.test c671fdbd34cd3bfe1518a777526ada595180cf8d
@@@ -1380,7 -1380,7 +1380,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 73d361ce9e4d72c943def8b0b3caa227f9199aed 66f92a16866e5825363636b9cc4b8f9b29d9e84d
- R b576dddb4c7e794820789b114785ae51
 -P 2e8e239cec5a12ac81cf62c0fbe94fb5713c31b1
 -R e2bf483acb1667e13821f8d776f13acb
++P cf452028d1be2c5578a07f6e21b4d8b613373eb8 1da60c3dda4254620052a83c853c2d2b6dd5009f
++R 64522485917d5b93eb19dc63143d2895
  U drh
- Z e54726d52fd301793beed6904550b28b
 -Z ec66207700973851a4a5019af1bd75d1
++Z 590b51e0f03c976eccd82950be2fb3fc

diff --cc manifest.uuid
index 7a8a35cd8528e2c2ea2563b23f2cd60fd3bbf660,17d2b0dd8c4dc014b485020eb84a22f9d99cb184..a7185b17940ea71a6a7e14b70a71db6004d791d3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cf452028d1be2c5578a07f6e21b4d8b613373eb8
 -1da60c3dda4254620052a83c853c2d2b6dd5009f
++7bde6d4d8cf05e1beb9bdf20b85760dc3e7a76c9

diff --cc src/build.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc test/rowid.test
index 21696f683942c99d5c781578afe469a35538fde9,b00b5287fdf1673ab5d3f6b90fb5bea61eee2d0d..56336453faa1a08373c7c0ed9adc7da227f70cb5
--- 1/test/rowid.test
--- 2/test/rowid.test
+++ b/test/rowid.test
@@@ -144,7 -144,6 +144,8 @@@ do_test rowid-2.8 
    execsql {SELECT x FROM t1 ORDER BY x}
  } {1 3 5 7 9}
  
- if 0 {  # we can now....
++if 0 {  # With the index-on-expressions enhancement, creating
++        # an index on ROWID has become possible.
  # We cannot index by ROWID
  #
  do_test rowid-2.9 {