Merge changes from trunk.

FossilOrigin-Name: c80e9e8e8cc1e7676d7c782ee0827726875db79e

diff --cc manifest
index 8a7ec7eaf1a24f6a2e09ccabf48aabbbfff2baf2,13b7cb4d990b7a13f9de5444a44d291dc1f5c102..1f899d463c5eda7962bc6c3382e3624ed0246959
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Adjustments\sto\sthe\sWHERE\sterm\sscanning,\sto\sbetter\shandle\sscanning\sterms\sof\nan\sindex.
- D 2015-08-27T15:58:51.073
 -C Reduce\sthe\ssize\sof\sthe\sWhereScan\sobject\sby\s24\sbytes\swhile\salso\sclarifying\sits\noperation.
 -D 2015-08-26T21:08:04.505
++C Merge\schanges\sfrom\strunk.
++D 2015-08-27T16:07:02.026
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -414,8 -414,8 +414,8 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 0709bbc33117a21db57a031b1452a35de14bf86b
- F src/whereInt.h 880a8599226ac1c00203490d934f3ed79b292572
 -F src/where.c caabc9ec1e86168d7717833700cfed01a75f687a
++F src/where.c 7b62bfb9a6d98cbba33bfc7914f823a9ad854b33
+ F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
  F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
  F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -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 ec6ddb3d481d005c304a26c948c9c808586750e9
- R e5ffdfd8fde6c8b7686cb0a9ca3923f7
 -P c2f3bbad778504681b39ab9399a1eb3c1a35ab3f
 -R f5f6b9b31662d17ccccce315f9a81df1
++P 5611130a595e7f0b6d5f21d76f2755e9c09c7810 cbc3c9a8bf169ae0b21f26855038502c6cc25cfe
++R 5eb2cbc19058900f308a8789aae8ba36
  U drh
- Z 4ee413196597973385c2eb895ecb052b
 -Z be2744e78cce20e5ac9fa855b3738fc2
++Z a8340d48ea4d99e733a68ecfeafbe44a

diff --cc manifest.uuid
index 5b29dbd27d34b1d566d84338ce557074420fa933,37ba53dcdaf97cc964318ac7d6c300c6c0026a3e..f9a3e724f55e8bbf8fe77e81e7c1377f8078cc16
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5611130a595e7f0b6d5f21d76f2755e9c09c7810
 -cbc3c9a8bf169ae0b21f26855038502c6cc25cfe
++c80e9e8e8cc1e7676d7c782ee0827726875db79e

diff --cc src/where.c
Simple merge