/ Check-in [0077c077]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0077c0772a884b54d81fa3733aac6f0c364ef1a8
User & Date: drh 2013-11-08 17:13:23
Context
2013-11-09
18:15
Throw an error if AUTOINCREMENT appears in a WITHOUT ROWID table. Updates to API documentation to discuss WITHOUT ROWID. check-in: b1abb2b0 user: drh tags: trunk
2013-11-08
18:13
Enhancements to the Win32 native heap integration. check-in: c54dc967 user: mistachkin tags: win32heap
17:13
Fix harmless compiler warnings. check-in: 0077c077 user: drh tags: trunk
17:03
Merge the Cygwin directory separator fix. Also fix a C++-ism in the multiplexor code so that it will compile on MSVC. check-in: 830629d3 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to src/fkey.c.

   594    594       Expr *pLeft;                  /* Value from parent table row */
   595    595       Expr *pRight;                 /* Column ref to child table */
   596    596       if( HasRowid(pTab) ){
   597    597         pLeft = exprTableRegister(pParse, pTab, regData, -1);
   598    598         pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, -1);
   599    599         pNe = sqlite3PExpr(pParse, TK_NE, pLeft, pRight, 0);
   600    600       }else{
   601         -      int i;
   602    601         Expr *pEq, *pAll = 0;
   603    602         Index *pPk = sqlite3PrimaryKeyIndex(pTab);
   604    603         for(i=0; i<pPk->nKeyCol; i++){
   605    604           i16 iCol = pIdx->aiColumn[i];
   606    605           pLeft = exprTableRegister(pParse, pTab, regData, iCol);
   607    606           pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, iCol);
   608    607           pEq = sqlite3PExpr(pParse, TK_EQ, pLeft, pRight, 0);

Changes to src/resolve.c.

   339    339           pTab = pParse->pTriggerTab;
   340    340         }
   341    341   
   342    342         if( pTab ){ 
   343    343           int iCol;
   344    344           pSchema = pTab->pSchema;
   345    345           cntTab++;
   346         -        for(iCol=0; iCol<pTab->nCol; iCol++){
   347         -          Column *pCol = &pTab->aCol[iCol];
          346  +        for(iCol=0, pCol=pTab->aCol; iCol<pTab->nCol; iCol++, pCol++){
   348    347             if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
   349    348               if( iCol==pTab->iPKey ){
   350    349                 iCol = -1;
   351    350               }
   352    351               break;
   353    352             }
   354    353           }

Changes to src/where.c.

  6242   6242         last = sqlite3VdbeCurrentAddr(v);
  6243   6243         k = pLevel->addrBody;
  6244   6244         pOp = sqlite3VdbeGetOp(v, k);
  6245   6245         for(; k<last; k++, pOp++){
  6246   6246           if( pOp->p1!=pLevel->iTabCur ) continue;
  6247   6247           if( pOp->opcode==OP_Column ){
  6248   6248             int x = pOp->p2;
  6249         -          Table *pTab = pIdx->pTable;
         6249  +          assert( pIdx->pTable==pTab );
  6250   6250             if( !HasRowid(pTab) ){
  6251   6251               Index *pPk = sqlite3PrimaryKeyIndex(pTab);
  6252   6252               x = pPk->aiColumn[x];
  6253   6253             }
  6254   6254             x = sqlite3ColumnOfIndex(pIdx, x);
  6255   6255             if( x>=0 ){
  6256   6256               pOp->p2 = x;