diff options
author | drh <drh@noemail.net> | 2013-09-12 17:29:25 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2013-09-12 17:29:25 +0000 |
commit | a4c3c87e3dea5b596ebf28e3b91b3d8aa3be4bd6 (patch) | |
tree | e117f81390471a90020ae243743eefde3aad6648 /src/select.c | |
parent | 7d9e7d8287368bfd65825567a39ef23465d7bda5 (diff) | |
parent | c5cd124900f463df0410da7f30e8d47ec07810d5 (diff) | |
download | sqlite-a4c3c87e3dea5b596ebf28e3b91b3d8aa3be4bd6.tar.gz sqlite-a4c3c87e3dea5b596ebf28e3b91b3d8aa3be4bd6.zip |
Merge in the Expr.flags expansion to 32-bits. Use an extra bit to help
optimize the sqlite3ExprSkipCollate() routine.
FossilOrigin-Name: 4c84d1b4c20f18921dd705bf67e8225975b83e86
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); |