:-) (CVS 74)
FossilOrigin-Name: 2ffeb8509c469f5a499d56bb109da079fcdff570
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d2b1347..a4530ce 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -23,7 +23,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.21 2000/06/07 15:24:40 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.22 2000/06/07 23:51:51 drh Exp $
*/
#include "sqlite.h"
#include "dbbe.h"
@@ -182,8 +182,9 @@
struct {
Expr *pExpr; /* The list of expressions */
char *zName; /* Token associated with this expression */
- int idx; /* ... */
- int isAgg; /* True if this is an aggregate like count(*) */
+ char sortOrder; /* 1 for DESC or 0 for ASC */
+ char isAgg; /* True if this is an aggregate like count(*) */
+ char done; /* A flag to indicate when processing is finished */
} *a; /* One entry for each expression */
};
@@ -279,6 +280,7 @@
Token sLastToken; /* The last token parsed */
Table *pNewTable; /* A table being constructed by CREATE TABLE */
Vdbe *pVdbe; /* An engine for executing database bytecode */
+ int colNamesSet; /* TRUE after OP_ColumnCount has been issued to pVdbe */
int explain; /* True if the EXPLAIN flag is found on the query */
int initFlag; /* True if reparsing CREATE TABLEs */
int nErr; /* Number of errors seen */
@@ -349,8 +351,10 @@
int sqliteLikeCompare(const unsigned char*,const unsigned char*);
char *sqliteTableNameFromToken(Token*);
int sqliteExprCheck(Parse*, Expr*, int, int*);
+int sqliteExprCompare(Expr*, Expr*);
int sqliteFuncId(Token*);
int sqliteExprResolveIds(Parse*, IdList*, Expr*);
void sqliteExprResolveInSelect(Parse*, Expr*);
int sqliteExprAnalyzeAggregates(Parse*, Expr*);
-void sqlitePArseInfoReset(Parse*);
+void sqliteParseInfoReset(Parse*);
+Vdbe *sqliteGetVdbe(Parse*);