Index: src/fkey.c
==================================================================
--- src/fkey.c
+++ src/fkey.c
@@ -596,11 +596,10 @@
     if( HasRowid(pTab) ){
       pLeft = exprTableRegister(pParse, pTab, regData, -1);
       pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, -1);
       pNe = sqlite3PExpr(pParse, TK_NE, pLeft, pRight, 0);
     }else{
-      int i;
       Expr *pEq, *pAll = 0;
       Index *pPk = sqlite3PrimaryKeyIndex(pTab);
       for(i=0; i<pPk->nKeyCol; i++){
         i16 iCol = pIdx->aiColumn[i];
         pLeft = exprTableRegister(pParse, pTab, regData, iCol);

Index: src/resolve.c
==================================================================
--- src/resolve.c
+++ src/resolve.c
@@ -341,12 +341,11 @@
 
       if( pTab ){ 
         int iCol;
         pSchema = pTab->pSchema;
         cntTab++;
-        for(iCol=0; iCol<pTab->nCol; iCol++){
-          Column *pCol = &pTab->aCol[iCol];
+        for(iCol=0, pCol=pTab->aCol; iCol<pTab->nCol; iCol++, pCol++){
           if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
             if( iCol==pTab->iPKey ){
               iCol = -1;
             }
             break;

Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -6244,11 +6244,11 @@
       pOp = sqlite3VdbeGetOp(v, k);
       for(; k<last; k++, pOp++){
         if( pOp->p1!=pLevel->iTabCur ) continue;
         if( pOp->opcode==OP_Column ){
           int x = pOp->p2;
-          Table *pTab = pIdx->pTable;
+          assert( pIdx->pTable==pTab );
           if( !HasRowid(pTab) ){
             Index *pPk = sqlite3PrimaryKeyIndex(pTab);
             x = pPk->aiColumn[x];
           }
           x = sqlite3ColumnOfIndex(pIdx, x);