Variable name changes in the query optimizer for disambiguation and
clarification. Clear space in boolean vectors for new bit values to
encode new query plan templates. (CVS 5980)
FossilOrigin-Name: 81bd0b5ce8a1cf057064c44e9b5371502cb8c58c
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0cd41f8..c03b6b4 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqliteInt.h,v 1.800 2008/12/04 20:40:10 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.801 2008/12/05 02:36:34 drh Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -1517,7 +1517,7 @@
*/
struct WhereLevel {
int iFrom; /* Which entry in the FROM clause */
- int flags; /* Flags associated with this level */
+ int wsFlags; /* "Where-Scan Flags" associated with this level */
int iMem; /* First memory cell used by this level */
int iLeftJoin; /* Memory cell used to implement LEFT OUTER JOIN */
Index *pIdx; /* Index used. NULL if no index */
@@ -1544,7 +1544,7 @@
};
/*
-** Flags appropriate for the wflags parameter of sqlite3WhereBegin().
+** Flags appropriate for the wctrlFlags parameter of sqlite3WhereBegin().
*/
#define WHERE_ORDERBY_NORMAL 0 /* No-op */
#define WHERE_ORDERBY_MIN 1 /* ORDER BY processing for min() func */