database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Merge changes from trunk.

Browse Source 
FossilOrigin-Name: 54d96772e78b7f57d5b590aebe34a139ade73629aebe16677372650b33513b1d
This commit is contained in:
drh
2018-04-16 10:47:38 +00:00
parent e966a36cf4 f5ced1f3b1
commit 1d621f7f0d
8 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/expr.c
View File

@@ -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: {