aboutsummaryrefslogtreecommitdiff
path: root/src/sqliteInt.h
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-02-09 16:09:34 +0000
committerdrh <drh@noemail.net>2015-02-09 16:09:34 +0000
commit2308ed385462208621ce052e5736b317fa81068f (patch)
treef8de76952454441f86a8fdf61fc70503c5453ceb /src/sqliteInt.h
parent885a5b030ee3717b78bfb82d61e6ee38ef0892ea (diff)
downloadsqlite-2308ed385462208621ce052e5736b317fa81068f.tar.gz
sqlite-2308ed385462208621ce052e5736b317fa81068f.zip
Propagate the COLLATE operator upward through function calls.
Initial fix for ticket [ca0d20b6cdddec5e8]. FossilOrigin-Name: c053448a55f9d030e8ffe88cf4fc14ada7f6ec19
Diffstat (limited to 'src/sqliteInt.h')
-rw-r--r--src/sqliteInt.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e07ee4a5b..3f9a3a7cc 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3159,7 +3159,7 @@ ExprList *sqlite3ExprListAppend(Parse*,ExprList*,Expr*);
void sqlite3ExprListSetName(Parse*,ExprList*,Token*,int);
void sqlite3ExprListSetSpan(Parse*,ExprList*,ExprSpan*);
void sqlite3ExprListDelete(sqlite3*, ExprList*);
-int sqlite3AnyExprListHasProperty(const ExprList*,u32);
+u32 sqlite3ExprListFlags(const ExprList*);
int sqlite3Init(sqlite3*, char**);
int sqlite3InitCallback(void*, int, char**, char**);
void sqlite3Pragma(Parse*,Token*,Token*,Token*,int);
@@ -3743,12 +3743,11 @@ void sqlite3MemJournalOpen(sqlite3_file *);
int sqlite3MemJournalSize(void);
int sqlite3IsMemJournal(sqlite3_file *);
+void sqlite3ExprSetHeightAndFlags(Parse *pParse, Expr *p);
#if SQLITE_MAX_EXPR_DEPTH>0
- void sqlite3ExprSetHeight(Parse *pParse, Expr *p);
int sqlite3SelectExprHeight(Select *);
int sqlite3ExprCheckHeight(Parse*, int);
#else
- #define sqlite3ExprSetHeight(x,y)
#define sqlite3SelectExprHeight(x) 0
#define sqlite3ExprCheckHeight(x,y)
#endif