diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve.c | 4 | ||||
| -rw-r--r-- | src/sqliteInt.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resolve.c b/src/resolve.c index a878b0248..7a4984cd4 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -14,7 +14,7 @@ ** resolve all identifiers by associating them with a particular ** table and column. ** -** $Id: resolve.c,v 1.11 2008/11/17 19:18:55 danielk1977 Exp $ +** $Id: resolve.c,v 1.12 2008/12/09 13:04:29 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -963,7 +963,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ if( pItem->pSelect ){ const char *zSavedContext = pParse->zAuthContext; if( pItem->zName ) pParse->zAuthContext = pItem->zName; - sqlite3ResolveSelectNames(pParse, pItem->pSelect, &sNC); + sqlite3ResolveSelectNames(pParse, pItem->pSelect, pOuterNC /*&sNC*/); pParse->zAuthContext = zSavedContext; if( pParse->nErr || db->mallocFailed ) return WRC_Abort; } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 75b242882..ea558e19a 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.806 2008/12/09 01:32:03 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.807 2008/12/09 13:04:29 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -2030,9 +2030,9 @@ int sqlite3WalkSelectFrom(Walker*, Select*); ** Return code from the parse-tree walking primitives and their ** callbacks. */ -#define WRC_Continue 0 -#define WRC_Prune 1 -#define WRC_Abort 2 +#define WRC_Continue 0 /* Continue down into children */ +#define WRC_Prune 1 /* Omit children but continue walking siblings */ +#define WRC_Abort 2 /* Abandon the tree walk */ /* ** Assuming zIn points to the first byte of a UTF-8 character, |