diff options
| author | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-02 02:22:30 +0000 |
| commit | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (patch) | |
| tree | e820c4a4276381c4c71f8cf891e75dc67302fa8b /src/expr.c | |
| parent | e1ed0bb6077cc223fa54f58ae835f133d1c4aa59 (diff) | |
| parent | b8db549832d2acc2fc30327e6fb5c0474820f122 (diff) | |
| download | sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.tar.gz sqlite-33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9.zip | |
Merge all recent enhancements from trunk.
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index 403e81cf3..c91db2834 100644 --- a/src/expr.c +++ b/src/expr.c @@ -85,8 +85,7 @@ Expr *sqlite3ExprAddCollateToken( Expr *sqlite3ExprAddCollateString(Parse *pParse, Expr *pExpr, const char *zC){ Token s; assert( zC!=0 ); - s.z = zC; - s.n = sqlite3Strlen30(s.z); + sqlite3TokenInit(&s, (char*)zC); return sqlite3ExprAddCollateToken(pParse, pExpr, &s, 0); } |