diff options
author | drh <drh@noemail.net> | 2014-06-30 20:02:55 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-06-30 20:02:55 +0000 |
commit | f257b4c61332fc7d64ad870e912338d0f31ef027 (patch) | |
tree | fcb42b110f2d3dc03a3bdf577de80d691e70ae36 /src/expr.c | |
parent | 83f951ee95cf0b923400052891e55af9d79fa9b6 (diff) | |
parent | 49e77b19258af1f88465a05e4454cf764650de8e (diff) | |
download | sqlite-f257b4c61332fc7d64ad870e912338d0f31ef027.tar.gz sqlite-f257b4c61332fc7d64ad870e912338d0f31ef027.zip |
Merge the latest trunk enhancements into the sessions branch.
FossilOrigin-Name: a5d94eaba6aa12ff16d2a0af2fc752bcdb461877
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 08c121e38..803d93f30 100644 --- a/src/expr.c +++ b/src/expr.c @@ -33,7 +33,7 @@ char sqlite3ExprAffinity(Expr *pExpr){ int op; pExpr = sqlite3ExprSkipCollate(pExpr); - if( pExpr->flags & EP_Generic ) return SQLITE_AFF_NONE; + if( pExpr->flags & EP_Generic ) return 0; op = pExpr->op; if( op==TK_SELECT ){ assert( pExpr->flags&EP_xIsSelect ); |