Merge the nested aggregate query fix (ticket [c2ad16f997ee9c8ed]) unto trunk.

FossilOrigin-Name: e459c3360ba2543e52b5736d7a84f1ce67388d5c

diff --cc manifest
index 0d447b287afeb7f5be876290e084c186e1bced7a,37b2467e5e19cbb4da9d7beddc606383bc3883bf..02149062695517c15fd02f6bee8ba1bba9e3079e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Make\ssure\slookaside\smemory\sallocations\sare\sunusable\safter\sthey\sare\sfreed.
- D 2012-05-21T16:59:16.604
 -C Mark\sand\salways-true\sconditional\sas\ssuch.\s\sAdd\sthe\sfuzz-oss1.test\stest\smodule.
 -D 2012-05-21T21:20:57.295
++C Merge\sthe\snested\saggregate\squery\sfix\s(ticket\s[c2ad16f997ee9c8ed])\sunto\strunk.
++D 2012-05-21T21:26:17.383
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -997,7 -998,7 +998,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P fda1ea0bee0fe283e0ed5710058fdfc403519bac
- R 6e4bfedf4c57499c35337d815d50cfb9
 -P f3dd1fafd4718558de1f06139419a8c560d727f5
++P 3869aef6348018f584137f36f6924193a790e52f bdc01fd0fa0c15efbb32bf18527c71e3e4dc48ed
+ R 15d4dbbc25fb6a4a0d7e19b673fed210
  U drh
- Z bde27247c00eb88661bdbd820aaab779
 -Z 98ab51ffc1b65623ce8c0d9d22f1a6dd
++Z 861d1d99d6fb7da6ba53d2868b8d367e

diff --cc manifest.uuid
index 32e44bae487607708139700983f58e879b46bf62,3c94f7f4c148829511d2d27d115661def315c5e0..3043a3c3521c603fdce8927dc9310edb93e95569
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3869aef6348018f584137f36f6924193a790e52f
 -bdc01fd0fa0c15efbb32bf18527c71e3e4dc48ed
++e459c3360ba2543e52b5736d7a84f1ce67388d5c