From: drh <drh@noemail.net>
Date: Fri, 2 Nov 2012 18:48:49 +0000 (+0000)
Subject: Proposed fix for ticket [bfbf38e5e9].
X-Git-Tag: version-3.7.15~45^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e83a57f43624ab118976f732ede4eb46cb95372;p=thirdparty%2Fsqlite.git

Proposed fix for ticket [bfbf38e5e9].

FossilOrigin-Name: 18ae030dad30303129186738c27cdc4ba06362b9
---

diff --git a/manifest b/manifest
index 1cfc75f489..7cf290f29e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sout-of-date\scomment.\s\sNo\schanges\sto\scode.
-D 2012-11-02T18:24:57.937
+C Proposed\sfix\sfor\sticket\s[bfbf38e5e9].
+D 2012-11-02T18:48:49.928
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -130,7 +130,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
-F src/expr.c eec289bcac90fb13ada9ef184a4d9bb84f5aa68e
+F src/expr.c 3b25a95f3d309403940ba4a3212f197b8b6251d5
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
 F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
@@ -1021,7 +1021,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 9dca18f5fea84afbecb314ee1cdfb98430656af3
-R 3ba2075c2bb54e4c430b6beca83153a6
+P 10cc12b16b2f1ae4e6b3a84cef5a44564d282e9c
+R 8a1bfe0b9ce6f93a26fa652a9a697188
+T *branch * ticket-bfbf38e5e9
+T *sym-ticket-bfbf38e5e9 *
+T -sym-trunk *
 U drh
-Z 23b76a34e07f1ecdfd7e7199b52cce1c
+Z bedb5a372edd83ae79e50e9ef5149dad
diff --git a/manifest.uuid b/manifest.uuid
index fb84c6aab1..446670037e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10cc12b16b2f1ae4e6b3a84cef5a44564d282e9c
\ No newline at end of file
+18ae030dad30303129186738c27cdc4ba06362b9
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index d504be1392..ae828489a6 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4030,8 +4030,10 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
         ExprSetIrreducible(pExpr);
         pExpr->iAgg = (i16)i;
         pExpr->pAggInfo = pAggInfo;
+        return WRC_Prune;
+      }else{
+        return WRC_Continue;
       }
-      return WRC_Prune;
     }
   }
   return WRC_Continue;