diff options
| author | drh <drh@noemail.net> | 2014-06-30 20:25:03 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-06-30 20:25:03 +0000 |
| commit | 6614181610e4c40e44484a1c7b14b253d512ad77 (patch) | |
| tree | 32e5414c20778ef10ff1874ff6e1909f8bf2a133 /src/expr.c | |
| parent | 5dfcfe7dc0afd3140cb4c4279ba4cb43e517360e (diff) | |
| parent | 49e77b19258af1f88465a05e4454cf764650de8e (diff) | |
| download | sqlite-6614181610e4c40e44484a1c7b14b253d512ad77.tar.gz sqlite-6614181610e4c40e44484a1c7b14b253d512ad77.zip | |
Merge the latest trunk changes into the threads branch.
FossilOrigin-Name: ae23a65eb1547fbe8b86ab71477071990a22d31d
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 ); |