diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve.c | 2 | ||||
| -rw-r--r-- | src/test1.c | 1 | ||||
| -rw-r--r-- | src/vdbeInt.h | 4 | ||||
| -rw-r--r-- | src/where.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/resolve.c b/src/resolve.c index aeeec8837..f8cd9e5ab 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -263,8 +263,8 @@ static int lookupName( assert( pTab!=0 && pTab->zName!=0 ); assert( pTab->nCol>0 ); if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){ - ExprList *pEList = pItem->pSelect->pEList; int hit = 0; + pEList = pItem->pSelect->pEList; for(j=0; j<pEList->nExpr; j++){ if( sqlite3MatchSpanName(pEList->a[j].zSpan, zCol, zTab, zDb) ){ cnt++; diff --git a/src/test1.c b/src/test1.c index 393793d21..889d0db21 100644 --- a/src/test1.c +++ b/src/test1.c @@ -6236,7 +6236,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){ #ifdef SQLITE_DEBUG extern int sqlite3WhereTrace; extern int sqlite3OSTrace; - extern int sqlite3VdbeAddopTrace; extern int sqlite3WalTrace; #endif #ifdef SQLITE_TEST diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 959951588..b2bc3a634 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -123,7 +123,7 @@ struct VdbeFrame { VdbeCursor **apCsr; /* Array of Vdbe cursors for parent frame */ void *token; /* Copy of SubProgram.token */ i64 lastRowid; /* Last insert rowid (sqlite3.lastRowid) */ - u32 nCursor; /* Number of entries in apCsr */ + int nCursor; /* Number of entries in apCsr */ int pc; /* Program Counter in parent (calling) frame */ int nOp; /* Size of aOp array */ int nMem; /* Number of entries in aMem */ @@ -309,7 +309,7 @@ struct Vdbe { int nLabel; /* Number of labels used */ int *aLabel; /* Space to hold the labels */ u16 nResColumn; /* Number of columns in one row of the result set */ - u32 nCursor; /* Number of slots in apCsr[] */ + int nCursor; /* Number of slots in apCsr[] */ u32 magic; /* Magic number for sanity checking */ char *zErrMsg; /* Error message written here */ Vdbe *pPrev,*pNext; /* Linked list of VDBEs with the same Vdbe.db */ diff --git a/src/where.c b/src/where.c index f97bf019c..f8da65af9 100644 --- a/src/where.c +++ b/src/where.c @@ -4174,8 +4174,8 @@ static Bitmask codeOneLoopStart( for(j=1; j<=nConstraint; j++){ for(k=0; k<nConstraint; k++){ if( aUsage[k].argvIndex==j ){ - WhereTerm *pTerm = &pWC->a[aConstraint[k].iTermOffset]; int iTarget = iReg+j+1; + pTerm = &pWC->a[aConstraint[k].iTermOffset]; if( pTerm->eOperator & WO_IN ){ codeEqualityTerm(pParse, pTerm, pLevel, iTarget); addrNotFound = pLevel->addrNxt; |