Merge enhancements from trunk.

FossilOrigin-Name: 0e23a079bd648f9778c857ec51e39acfd30a4040

diff --cc manifest
index e1c3be01b6c5f9bcac274e7b7bc41c607cefe0df,a38aca8867498714f05d46c962823d73a39799d6..0fd0493f6d782c4bb43739119a6ce4dd59a226d2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Resolve\sFROM-clause\ssubqueries\safter\squery\splanning\sinstead\sof\sbefore.\nGreatly\sreduce\sthe\sestimated\scost\sof\sautomatic\sindexes\sfor\sVIEWs\sand\nephemeral\stables\ssince\sperformance\sproblems\sthere\scannot\sbe\smitigated\nvia\sa\sCREATE\sINDEX.
- D 2015-06-10T17:20:42.577
 -C "test"\stargets\son\sall\smakefiles\suse\s--verbose=file\s--output=test-out.txt.\nAdd\sthe\snew\s"quicktest"\starget\sto\sall\smakefiles\s-\sdesigned\sto\srun\sin\sunder\nthree\sminutes.\s\sThe\s--quick\soption\son\sreleasetest.tcl\snow\suses\squicktest.
 -D 2015-06-10T18:53:09.696
++C Merge\senhancements\sfrom\strunk.
++D 2015-06-10T20:00:49.246
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in a7b384855b72378fd860425b128ea5f75296e9d6
+ F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5438dc167466f51349ab0c4497aef547d0c9352c
+ F Makefile.msc 5a8418c81f736dfa953c809af1a48398017b3610
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -327,9 -327,9 +327,9 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 6a42bd33c17e8866c5f70c3e74eace4c2e106301
 -F src/where.c 95c0fbfff7aef890b5da7293f6d85cd9a5f99af8
++F src/where.c aa26f4b0a3ad9c586f3315cb499d2dc813e14f01
  F src/whereInt.h 5f87e3c4b0551747d119730dfebddd3c54f04047
 -F src/wherecode.c 0669481cabaf5caf934b6bb825df15bc57f60d40
 +F src/wherecode.c 3f3152ecf4224413bd0491ea4210883b85fe95d1
  F src/whereexpr.c 9ce1c9cfedbf80c93c7d899497025ec8256ce652
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1285,7 -1286,7 +1286,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cabf218716e3ba584dc27781ba5e2f9f00eab74c
- R 3e14ed600c1c4d5c883f594c595505eb
 -P 7b446771cadedafbe8924ad0658adc2597816dc7
 -R e13907780a1cb22e147b44d8ea4a5351
++P a1eaf1718e4544c17495ad7a4e333276979b8299 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
++R f469f404132e2683182471710f678f88
  U drh
- Z 6efad1a2bf4568abad0be136ee25ec44
 -Z 0da5f15a574d2a2ef40a9dda668b3442
++Z ba88f60c8354d22ddfa769e6c6d29dcf

diff --cc manifest.uuid
index 6894688901e4d7dacca1b66d78aa53020d9e58fd,3037113ee14546adb89b0e59b0cddd7b6f80c911..6b742cfefa45975e2fb162435903dc6b07acf552
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a1eaf1718e4544c17495ad7a4e333276979b8299
 -6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
++0e23a079bd648f9778c857ec51e39acfd30a4040

diff --cc src/where.c
Simple merge