diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 4 | ||||
| -rw-r--r-- | src/whereexpr.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/select.c b/src/select.c index 03d9c42cf..42a476c00 100644 --- a/src/select.c +++ b/src/select.c @@ -7486,7 +7486,7 @@ int sqlite3Select( sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset); SELECTTRACE(1,pParse,p,("WhereBegin\n")); pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, pDistinct, - 0, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY) + p, (sDistinct.isTnct==2 ? WHERE_DISTINCTBY : WHERE_GROUPBY) | (orderByGrp ? WHERE_SORTBYGROUP : 0) | distFlag, 0 ); if( pWInfo==0 ){ @@ -7785,7 +7785,7 @@ int sqlite3Select( SELECTTRACE(1,pParse,p,("WhereBegin\n")); pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pMinMaxOrderBy, - pDistinct, 0, minMaxFlag|distFlag, 0); + pDistinct, p, minMaxFlag|distFlag, 0); if( pWInfo==0 ){ goto select_end; } diff --git a/src/whereexpr.c b/src/whereexpr.c index 1816a01f4..24246c1aa 100644 --- a/src/whereexpr.c +++ b/src/whereexpr.c @@ -1603,8 +1603,8 @@ static void whereAddLimitExpr( */ void SQLITE_NOINLINE sqlite3WhereAddLimit(WhereClause *pWC, Select *p){ assert( p!=0 && p->pLimit!=0 ); /* 1 -- checked by caller */ - assert( p->pGroupBy==0 && (p->selFlags & SF_Aggregate)==0 ); - if( (p->selFlags & (SF_Distinct|SF_Aggregate))==0 /* 2 */ + if( p->pGroupBy==0 + && (p->selFlags & (SF_Distinct|SF_Aggregate))==0 /* 2 */ && (p->pSrc->nSrc==1 && IsVirtual(p->pSrc->a[0].pTab)) /* 3 */ ){ ExprList *pOrderBy = p->pOrderBy; |