diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 4 | ||||
| -rw-r--r-- | src/select.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index 72a5fae7d..549888ec6 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1208,7 +1208,7 @@ void sqlite3ExprAddFunctionOrderBy( ){ Expr *pOB; sqlite3 *db = pParse->db; - if( pOrderBy==0 ){ + if( NEVER(pOrderBy==0) ){ assert( db->mallocFailed ); return; } @@ -6757,10 +6757,10 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){ pExpr->x.pList->a[0].pExpr,0)==0 ){ pItem->bOBPayload = 0; - pItem->bOBUnique = ExprHasProperty(pExpr, EP_Distinct); }else{ pItem->bOBPayload = 1; } + pItem->bOBUnique = ExprHasProperty(pExpr, EP_Distinct); }else{ pItem->iOBTab = -1; } diff --git a/src/select.c b/src/select.c index 69e22ba3e..30a44d045 100644 --- a/src/select.c +++ b/src/select.c @@ -6716,14 +6716,14 @@ static void finalizeAggFunctions(Parse *pParse, AggInfo *pAggInfo){ nKey = pF->pFExpr->pLeft->x.pList->nExpr; if( !pF->bOBUnique ) nKey++; } - iTop = sqlite3VdbeAddOp1(v, OP_Rewind, pF->iOBTab); + iTop = sqlite3VdbeAddOp1(v, OP_Rewind, pF->iOBTab); VdbeCoverage(v); for(j=nArg-1; j>=0; j--){ sqlite3VdbeAddOp3(v, OP_Column, pF->iOBTab, nKey+j, regAgg+j); } sqlite3VdbeAddOp3(v, OP_AggStep, 0, regAgg, AggInfoFuncReg(pAggInfo,i)); sqlite3VdbeAppendP4(v, pF->pFunc, P4_FUNCDEF); sqlite3VdbeChangeP5(v, (u8)nArg); - sqlite3VdbeAddOp2(v, OP_Next, pF->iOBTab, iTop+1); + sqlite3VdbeAddOp2(v, OP_Next, pF->iOBTab, iTop+1); VdbeCoverage(v); sqlite3VdbeJumpHere(v, iTop); sqlite3ReleaseTempRange(pParse, regAgg, nArg); } |