diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 2 | ||||
| -rw-r--r-- | src/where.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/expr.c b/src/expr.c index 4d8087579..271d9dea8 100644 --- a/src/expr.c +++ b/src/expr.c @@ -6420,7 +6420,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){ } if( pIEpr==0 ) break; if( NEVER(!ExprUseYTab(pExpr)) ) break; - assert( pExpr->pAggInfo==0 ); + if( pExpr->pAggInfo!=0 ) break; /* Already resolved by outer context */ /* If we reach this point, it means that expression pExpr can be ** translated into a reference to an index column as described by diff --git a/src/where.c b/src/where.c index 1df7673ae..d3e04808f 100644 --- a/src/where.c +++ b/src/where.c @@ -6240,10 +6240,7 @@ WhereInfo *sqlite3WhereBegin( op = OP_ReopenIdx; }else{ iIndexCur = pParse->nTab++; - if( pIx->bHasExpr - && OptimizationEnabled(db, SQLITE_IndexedExpr) - && (pTabItem->fg.jointype & (JT_LTORJ|JT_RIGHT))==0 - ){ + if( pIx->bHasExpr && OptimizationEnabled(db, SQLITE_IndexedExpr) ){ whereAddIndexedExpr(pParse, pIx, iIndexCur, pTabItem); } } |