Fix the OR-optimization so that it always ignores subplans that do not use an index.

FossilOrigin-Name: cf452028d1be2c5578a07f6e21b4d8b613373eb8

diff --cc manifest
index 901fd7000641f81c91a7d9e896bbd173315782d1,4c7e7c03468799561e6375154b1bea5ef972db8f..aab422faac3d8d3e8a07adb2cdf171e4ccd8d599
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sEXPLAIN\sQUERY\sPLAN\soutput\sfor\sindexed-expressions.\s\sFix\sanother\nobscure\sfault\sin\sthe\sWHERE\sterm\sscanner.
- D 2015-08-27T20:33:38.975
 -C Fix\sthe\sOR-optimization\sso\sthat\sit\salways\signores\ssubplans\sthat\sdo\snot\nuse\san\sindex.
 -D 2015-08-27T23:18:55.309
++C Fix\sthe\sOR-optimization\sso\sthat\sit\salways\signores\ssubplans\sthat\sdo\snot\suse\san\sindex.
++D 2015-08-27T23:42:43.629
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -414,10 -414,10 +414,10 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c b22b416694905555a0cbbd7d8881179392a56aba
 -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
@@@ -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 03375017691d5b480e73d712c4318632e835060c
- R 8aa1e38f792c255d32b6cb36a0f80565
 -P cbc3c9a8bf169ae0b21f26855038502c6cc25cfe
 -R 3aef897e420a61a50263b8e461848e83
++P 73d361ce9e4d72c943def8b0b3caa227f9199aed 66f92a16866e5825363636b9cc4b8f9b29d9e84d
++R b576dddb4c7e794820789b114785ae51
  U drh
- Z dc558ff8656aec58d6de7d38d850c48a
 -Z b614bfef572643d9445d8b8a4d103409
++Z e54726d52fd301793beed6904550b28b

diff --cc manifest.uuid
index 77236f721d365e53bceaa6990b5afbea8f5122a9,a3b504350e35a8ed7ec7f75c9e51573bec2fc823..7a8a35cd8528e2c2ea2563b23f2cd60fd3bbf660
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 73d361ce9e4d72c943def8b0b3caa227f9199aed
 -66f92a16866e5825363636b9cc4b8f9b29d9e84d
++cf452028d1be2c5578a07f6e21b4d8b613373eb8

diff --cc src/where.c
Simple merge