diff options
| author | drh <drh@noemail.net> | 2018-04-16 10:47:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-04-16 10:47:38 +0000 |
| commit | 1d621f7f0dcb9a12cc5274e503cdb1d7e7bf24f4 (patch) | |
| tree | dd0831ea1e3e2396fe36c3a86b3b8efe91267710 /src/expr.c | |
| parent | e966a36cf4f771b200a5cfbf3714d4a33679c9d4 (diff) | |
| parent | f5ced1f3b14994816b476e63bf37213dce33f10d (diff) | |
| download | sqlite-1d621f7f0dcb9a12cc5274e503cdb1d7e7bf24f4.tar.gz sqlite-1d621f7f0dcb9a12cc5274e503cdb1d7e7bf24f4.zip | |
Merge changes from trunk.
FossilOrigin-Name: 54d96772e78b7f57d5b590aebe34a139ade73629aebe16677372650b33513b1d
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index ca7c96604..63b79c2f0 100644 --- a/src/expr.c +++ b/src/expr.c @@ -5257,8 +5257,9 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){ NameContext *pNC = pWalker->u.pNC; Parse *pParse = pNC->pParse; SrcList *pSrcList = pNC->pSrcList; - AggInfo *pAggInfo = pNC->pAggInfo; + AggInfo *pAggInfo = pNC->uNC.pAggInfo; + assert( pNC->ncFlags & NC_UAggInfo ); switch( pExpr->op ){ case TK_AGG_COLUMN: case TK_COLUMN: { |