diff options
| author | dan <dan@noemail.net> | 2015-11-24 17:44:26 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-11-24 17:44:26 +0000 |
| commit | 898f70bc28c4536a3b42c93d7d7aa8f68ca78c8a (patch) | |
| tree | 2c8933075b41ad356d6b5904fb8e7ba5601818ef /src/expr.c | |
| parent | 43970dd7745c3fdb258ce6bb86971fd5ce87cfdf (diff) | |
| parent | 5a8d190b9ecf9e38857bfa77440a4e9c91aa28e3 (diff) | |
| download | sqlite-898f70bc28c4536a3b42c93d7d7aa8f68ca78c8a.tar.gz sqlite-898f70bc28c4536a3b42c93d7d7aa8f68ca78c8a.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 99222bb3e5f9b2a9a10d9561a9fd8c0f717baaff
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index 0255d6902..8cf018f9d 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3818,7 +3818,7 @@ int sqlite3ExprCompare(Expr *pA, Expr *pB, int iTab){ } return 2; } - if( pA->op!=TK_COLUMN && ALWAYS(pA->op!=TK_AGG_COLUMN) && pA->u.zToken ){ + if( pA->op!=TK_COLUMN && pA->op!=TK_AGG_COLUMN && pA->u.zToken ){ if( pA->op==TK_FUNCTION ){ if( sqlite3StrICmp(pA->u.zToken,pB->u.zToken)!=0 ) return 2; }else if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){ |