diff options
| author | drh <drh@noemail.net> | 2019-11-10 10:08:03 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-11-10 10:08:03 +0000 |
| commit | 9576802dbae4501cbec42947ce01286376d2fc10 (patch) | |
| tree | fdfae3618ac97def53dc27352c971ea821abca33 /src/expr.c | |
| parent | 12bf7127073c26905ef40ae2cf972ffe95d01b6b (diff) | |
| download | sqlite-9576802dbae4501cbec42947ce01286376d2fc10.tar.gz sqlite-9576802dbae4501cbec42947ce01286376d2fc10.zip | |
Remove an incorrect ALWAYS() macro.
FossilOrigin-Name: f7a74f89dbd58b47bbcb58ea2af71fbe1eb5ec2dbe36d90685c39cb28ecf5250
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index 093736f39..45c053a8c 100644 --- a/src/expr.c +++ b/src/expr.c @@ -190,15 +190,12 @@ CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){ Expr *pNext = p->pRight; /* The Expr.x union is never used at the same time as Expr.pRight */ assert( p->x.pList==0 || p->pRight==0 ); - /* p->flags holds EP_Collate and p->pLeft->flags does not. And - ** p->x.pSelect cannot. So if p->x.pLeft exists, it must hold at - ** least one EP_Collate. Thus the following two ALWAYS. */ if( p->x.pList!=0 && !db->mallocFailed && ALWAYS(!ExprHasProperty(p, EP_xIsSelect)) ){ int i; - for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){ + for(i=0; i<p->x.pList->nExpr; i++){ if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){ pNext = p->x.pList->a[i].pExpr; break; |