Merge bug fix from trunk.

FossilOrigin-Name: a905d5e08de3f3c60b667d840b5995911372647d

diff --cc manifest
index 395f4ec4d5627e97c45635efadc5283ada391e22,10b7a29fe4a15e40ed01285a87b908c55fc98266..713cf4421cb350d79478913ddc63106f4e9fd552
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\stemporary\sdirectory\ssearch\salgorithm\sfix\sfrom\strunk.
- D 2016-04-23T21:16:55.627
- F Makefile.in eba680121821b8a60940a81454316f47a341487a
 -C When\schecking\sfor\sthe\sWHERE-clause\spush-down\soptimization,\sverify\sthat\nall\sterms\sof\sthe\scompound\sinner\sSELECT\sare\snon-aggregate,\snot\sjust\sthe\nlast\sterm.\s\sFix\sfor\sticket\s[f7f8c97e97597].
 -D 2016-04-25T02:20:10.236
++C Merge\sbug\sfix\sfrom\strunk.
++D 2016-04-25T15:03:49.467
+ F Makefile.in a905f3180accdafbd5a534bf26126ee5306d5056
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -1486,7 -1484,7 +1486,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 84da122dd6e70ed603fea781dca204ae2f668c53 b38fe522cfc971b37ca04e7b63a92bbb6e0b01e1
- R 1c713059486f406d1d7b0495652a35d4
 -P d0a579b35105810821bbfec6b50ecfebac7a17ee
 -R 858c551be0612332d0982a3a42946fb6
++P 9b8fec60d8e576cd09e1d075a59bfad1c6169d7a ec215f94ac9748c0acd82af0cc9e7a92249462f9
++R e941df834a8d6e2084dd43227adc9b5d
  U drh
- Z a4b2d03080ca1bec249054a4e309e0ee
 -Z c1158477a3c6966fdb5709eb9b3c8fe5
++Z 530f6cc77507869285e9eb18ff03544a

diff --cc manifest.uuid
index 558a12a79882a47574888f13da93e151c4e9e092,580a058689b135f4432337b5a524c6ce95d9d1cd..02d571129de4ec780711109e8d1fdabbf1eb98d7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9b8fec60d8e576cd09e1d075a59bfad1c6169d7a
 -ec215f94ac9748c0acd82af0cc9e7a92249462f9
++a905d5e08de3f3c60b667d840b5995911372647d