diff options
| author | drh <drh@noemail.net> | 2013-09-12 16:50:49 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-09-12 16:50:49 +0000 |
| commit | c5cd124900f463df0410da7f30e8d47ec07810d5 (patch) | |
| tree | 6ed728b3a36777d4e14db55c062ccd0a385dd42e /src/select.c | |
| parent | a9cb5be49aed9014dfc7fcc74f7bf4bfe62909cf (diff) | |
| download | sqlite-c5cd124900f463df0410da7f30e8d47ec07810d5.tar.gz sqlite-c5cd124900f463df0410da7f30e8d47ec07810d5.zip | |
Increase the number of bits available in Expr.flags. Other tweaks aimed at
making expression processing more robust.
FossilOrigin-Name: 579a512538528cf4bb4381ba393c5d9e7310086b
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/select.c b/src/select.c index 6e409e73a..f0dbf8091 100644 --- a/src/select.c +++ b/src/select.c @@ -264,7 +264,7 @@ static void addWhereTerm( pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2, 0); if( pEq && isOuterJoin ){ ExprSetProperty(pEq, EP_FromJoin); - assert( !ExprHasAnyProperty(pEq, EP_TokenOnly|EP_Reduced) ); + assert( !ExprHasProperty(pEq, EP_TokenOnly|EP_Reduced) ); ExprSetIrreducible(pEq); pEq->iRightJoinTable = (i16)pE2->iTable; } @@ -300,7 +300,7 @@ static void addWhereTerm( static void setJoinExpr(Expr *p, int iTable){ while( p ){ ExprSetProperty(p, EP_FromJoin); - assert( !ExprHasAnyProperty(p, EP_TokenOnly|EP_Reduced) ); + assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) ); ExprSetIrreducible(p); p->iRightJoinTable = (i16)iTable; setJoinExpr(p->pLeft, iTable); |