diff options
| author | drh <drh@noemail.net> | 2008-12-10 18:03:45 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-12-10 18:03:45 +0000 |
| commit | b27b7f5d3b5d9d249b9abb258ac0e6cb54b78fdd (patch) | |
| tree | f266bfdff1ff55e5405f2bb29424ce7560cfbb8c /src/select.c | |
| parent | dc5ea5c785bcbd5a623915b47edb42c772439a8d (diff) | |
| download | sqlite-b27b7f5d3b5d9d249b9abb258ac0e6cb54b78fdd.tar.gz sqlite-b27b7f5d3b5d9d249b9abb258ac0e6cb54b78fdd.zip | |
More explicit type casting to silence VC++. (CVS 6006)
FossilOrigin-Name: 14e6d19c3157ccdce170e769d678c7f472dd3db2
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/select.c b/src/select.c index a2b532c77..3468c1fd3 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.491 2008/12/10 17:20:01 drh Exp $ +** $Id: select.c,v 1.492 2008/12/10 18:03:46 drh Exp $ */ #include "sqliteInt.h" @@ -2034,7 +2034,7 @@ static int multiSelectOrderBy( int regOutA; /* Address register for the output-A subroutine */ int regOutB; /* Address register for the output-B subroutine */ int addrOutA; /* Address of the output-A subroutine */ - int addrOutB; /* Address of the output-B subroutine */ + int addrOutB = 0; /* Address of the output-B subroutine */ int addrEofA; /* Address of the select-A-exhausted subroutine */ int addrEofB; /* Address of the select-B-exhausted subroutine */ int addrAltB; /* Address of the A<B subroutine */ @@ -3539,17 +3539,13 @@ int sqlite3Select( p->selFlags &= ~SF_Distinct; } sqlite3SelectPrep(pParse, p, 0); + pTabList = p->pSrc; + pEList = p->pEList; if( pParse->nErr || db->mallocFailed ){ goto select_end; } p->pOrderBy = pOrderBy; - - - /* Make local copies of the parameters for this query. - */ - pTabList = p->pSrc; isAgg = (p->selFlags & SF_Aggregate)!=0; - pEList = p->pEList; if( pEList==0 ) goto select_end; /* |