diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 7 | ||||
| -rw-r--r-- | src/select.c | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/expr.c b/src/expr.c index b65003522..88a86cd63 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.389 2008/08/20 16:35:10 drh Exp $ +** $Id: expr.c,v 1.390 2008/08/22 16:29:51 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -2423,10 +2423,7 @@ int sqlite3ExprCodeExprList( ){ struct ExprList_item *pItem; int i, n; - assert( pList!=0 || pParse->db->mallocFailed ); - if( pList==0 ){ - return 0; - } + assert( pList!=0 ); assert( target>0 ); n = pList->nExpr; for(pItem=pList->a, i=0; i<n; i++, pItem++){ diff --git a/src/select.c b/src/select.c index 0b4662f70..3af289df1 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.468 2008/08/21 14:54:29 drh Exp $ +** $Id: select.c,v 1.469 2008/08/22 16:29:51 drh Exp $ */ #include "sqliteInt.h" @@ -3149,11 +3149,7 @@ static int selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){ SrcList *pTabList; struct SrcList_item *pFrom; - if( (p->selFlags & SF_Resolved)==0 ){ - /* If the ORDER BY clause of a compound SELECT contains a subquery, - ** that subquery will not yet have been resolved. */ - return WRC_Prune; - } + assert( p->selFlags & SF_Resolved ); if( (p->selFlags & SF_HasTypeInfo)==0 ){ p->selFlags |= SF_HasTypeInfo; pParse = pWalker->pParse; |