diff options
| author | drh <drh@noemail.net> | 2019-08-22 19:35:24 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-08-22 19:35:24 +0000 |
| commit | a677eecad3dc751db19aaf27b6c0674200ecef21 (patch) | |
| tree | c96b9bd7b42a05a667dbcb8e7222ca86b6165f51 /src/sqliteInt.h | |
| parent | f236b21f4b3dba4c104fcda5eb582297be89efe9 (diff) | |
| parent | 0d950af311f8db2c34efa5da0256477794b9c3dd (diff) | |
| download | sqlite-a677eecad3dc751db19aaf27b6c0674200ecef21.tar.gz sqlite-a677eecad3dc751db19aaf27b6c0674200ecef21.zip | |
Merge fixes from trunk. Also fix a reference to the KeyInfo.aSortOrder field,
which should now be KeyInfo.aSortFlags
FossilOrigin-Name: 63e625c8eb06720eef30573aa562e38c90d228a9cf493f8bb59f09e50f0e3168
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b77740917..b2e17c40b 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -4278,6 +4278,7 @@ int sqlite3ExprCollSeqMatch(Parse*,Expr*,Expr*); Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, const Token*, int); Expr *sqlite3ExprAddCollateString(Parse*,Expr*,const char*); Expr *sqlite3ExprSkipCollate(Expr*); +Expr *sqlite3ExprSkipCollateAndLikely(Expr*); int sqlite3CheckCollSeq(Parse *, CollSeq *); int sqlite3WritableSchema(sqlite3*); int sqlite3CheckObjectName(Parse*, const char*,const char*,const char*); |