• branch=trunk inherited from [704b122e53]
• sym-trunk inherited from [704b122e53]

Changes to src/resolve.c

  259          Table *pTab;                                                                 259          Table *pTab;
  260          Column *pCol;                                                                260          Column *pCol;
  261                                                                                       261  
  262          pTab = pItem->pTab;                                                          262          pTab = pItem->pTab;
  263          assert( pTab!=0 && pTab->zName!=0 );                                         263          assert( pTab!=0 && pTab->zName!=0 );
  264          assert( pTab->nCol>0 );                                                      264          assert( pTab->nCol>0 );
  265          if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){       265          if( pItem->pSelect && (pItem->pSelect->selFlags & SF_NestedFrom)!=0 ){
  266            ExprList *pEList = pItem->pSelect->pEList;                             <
  267            int hit = 0;                                                               266            int hit = 0;
                                                                                        >   267            pEList = pItem->pSelect->pEList;
  268            for(j=0; j<pEList->nExpr; j++){                                            268            for(j=0; j<pEList->nExpr; j++){
  269              if( sqlite3MatchSpanName(pEList->a[j].zSpan, zCol, zTab, zDb) ){         269              if( sqlite3MatchSpanName(pEList->a[j].zSpan, zCol, zTab, zDb) ){
  270                cnt++;                                                                 270                cnt++;
  271                cntTab = 2;                                                            271                cntTab = 2;
  272                pMatch = pItem;                                                        272                pMatch = pItem;
  273                pExpr->iColumn = j;                                                    273                pExpr->iColumn = j;
  274                hit = 1;                                                               274                hit = 1;

Changes to src/test1.c

 6232    extern int sqlite3_pager_writej_count;                                            6232    extern int sqlite3_pager_writej_count;
 6233  #if SQLITE_OS_WIN                                                                   6233  #if SQLITE_OS_WIN
 6234    extern int sqlite3_os_type;                                                       6234    extern int sqlite3_os_type;
 6235  #endif                                                                              6235  #endif
 6236  #ifdef SQLITE_DEBUG                                                                 6236  #ifdef SQLITE_DEBUG
 6237    extern int sqlite3WhereTrace;                                                     6237    extern int sqlite3WhereTrace;
 6238    extern int sqlite3OSTrace;                                                        6238    extern int sqlite3OSTrace;
 6239    extern int sqlite3VdbeAddopTrace;                                              <
 6240    extern int sqlite3WalTrace;                                                       6239    extern int sqlite3WalTrace;
 6241  #endif                                                                              6240  #endif
 6242  #ifdef SQLITE_TEST                                                                  6241  #ifdef SQLITE_TEST
 6243    extern char sqlite3_query_plan[];                                                 6242    extern char sqlite3_query_plan[];
 6244    static char *query_plan = sqlite3_query_plan;                                     6243    static char *query_plan = sqlite3_query_plan;
 6245  #ifdef SQLITE_ENABLE_FTS3                                                           6244  #ifdef SQLITE_ENABLE_FTS3
 6246    extern int sqlite3_fts3_enable_parentheses;                                       6245    extern int sqlite3_fts3_enable_parentheses;

Changes to src/vdbeInt.h

  119    VdbeFrame *pParent;     /* Parent of this frame, or NULL if parent is main */      119    VdbeFrame *pParent;     /* Parent of this frame, or NULL if parent is main */
  120    Op *aOp;                /* Program instructions for parent frame */                120    Op *aOp;                /* Program instructions for parent frame */
  121    Mem *aMem;              /* Array of memory cells for parent frame */               121    Mem *aMem;              /* Array of memory cells for parent frame */
  122    u8 *aOnceFlag;          /* Array of OP_Once flags for parent frame */              122    u8 *aOnceFlag;          /* Array of OP_Once flags for parent frame */
  123    VdbeCursor **apCsr;     /* Array of Vdbe cursors for parent frame */               123    VdbeCursor **apCsr;     /* Array of Vdbe cursors for parent frame */
  124    void *token;            /* Copy of SubProgram.token */                             124    void *token;            /* Copy of SubProgram.token */
  125    i64 lastRowid;          /* Last insert rowid (sqlite3.lastRowid) */                125    i64 lastRowid;          /* Last insert rowid (sqlite3.lastRowid) */
  126    u32 nCursor;            /* Number of entries in apCsr */                       |   126    int nCursor;            /* Number of entries in apCsr */
  127    int pc;                 /* Program Counter in parent (calling) frame */            127    int pc;                 /* Program Counter in parent (calling) frame */
  128    int nOp;                /* Size of aOp array */                                    128    int nOp;                /* Size of aOp array */
  129    int nMem;               /* Number of entries in aMem */                            129    int nMem;               /* Number of entries in aMem */
  130    int nOnceFlag;          /* Number of entries in aOnceFlag */                       130    int nOnceFlag;          /* Number of entries in aOnceFlag */
  131    int nChildMem;          /* Number of memory cells for child frame */               131    int nChildMem;          /* Number of memory cells for child frame */
  132    int nChildCsr;          /* Number of cursors for child frame */                    132    int nChildCsr;          /* Number of cursors for child frame */
  133    int nChange;            /* Statement changes (Vdbe.nChanges)     */                133    int nChange;            /* Statement changes (Vdbe.nChanges)     */
................................................................................................................................................................................

  305    Mem *pResultSet;        /* Pointer to an array of results */                       305    Mem *pResultSet;        /* Pointer to an array of results */
  306    int nMem;               /* Number of memory locations currently allocated */       306    int nMem;               /* Number of memory locations currently allocated */
  307    int nOp;                /* Number of instructions in the program */                307    int nOp;                /* Number of instructions in the program */
  308    int nOpAlloc;           /* Number of slots allocated for aOp[] */                  308    int nOpAlloc;           /* Number of slots allocated for aOp[] */
  309    int nLabel;             /* Number of labels used */                                309    int nLabel;             /* Number of labels used */
  310    int *aLabel;            /* Space to hold the labels */                             310    int *aLabel;            /* Space to hold the labels */
  311    u16 nResColumn;         /* Number of columns in one row of the result set */       311    u16 nResColumn;         /* Number of columns in one row of the result set */
  312    u32 nCursor;            /* Number of slots in apCsr[] */                       |   312    int nCursor;            /* Number of slots in apCsr[] */
  313    u32 magic;              /* Magic number for sanity checking */                     313    u32 magic;              /* Magic number for sanity checking */
  314    char *zErrMsg;          /* Error message written here */                           314    char *zErrMsg;          /* Error message written here */
  315    Vdbe *pPrev,*pNext;     /* Linked list of VDBEs with the same Vdbe.db */           315    Vdbe *pPrev,*pNext;     /* Linked list of VDBEs with the same Vdbe.db */
  316    VdbeCursor **apCsr;     /* One element of this array for each open cursor */       316    VdbeCursor **apCsr;     /* One element of this array for each open cursor */
  317    Mem *aVar;              /* Values for the OP_Variable opcode. */                   317    Mem *aVar;              /* Values for the OP_Variable opcode. */
  318    char **azVar;           /* Name of variables */                                    318    char **azVar;           /* Name of variables */
  319    ynVar nVar;             /* Number of entries in aVar[] */                          319    ynVar nVar;             /* Number of entries in aVar[] */

Changes to src/where.c

 4170                                                                                      4170  
 4171      sqlite3ExprCachePush(pParse);                                                   4171      sqlite3ExprCachePush(pParse);
 4172      iReg = sqlite3GetTempRange(pParse, nConstraint+2);                              4172      iReg = sqlite3GetTempRange(pParse, nConstraint+2);
 4173      addrNotFound = pLevel->addrBrk;                                                 4173      addrNotFound = pLevel->addrBrk;
 4174      for(j=1; j<=nConstraint; j++){                                                  4174      for(j=1; j<=nConstraint; j++){
 4175        for(k=0; k<nConstraint; k++){                                                 4175        for(k=0; k<nConstraint; k++){
 4176          if( aUsage[k].argvIndex==j ){                                               4176          if( aUsage[k].argvIndex==j ){
 4177            WhereTerm *pTerm = &pWC->a[aConstraint[k].iTermOffset];                <
 4178            int iTarget = iReg+j+1;                                                   4177            int iTarget = iReg+j+1;
                                                                                        >  4178            pTerm = &pWC->a[aConstraint[k].iTermOffset];
 4179            if( pTerm->eOperator & WO_IN ){                                           4179            if( pTerm->eOperator & WO_IN ){
 4180              codeEqualityTerm(pParse, pTerm, pLevel, iTarget);                       4180              codeEqualityTerm(pParse, pTerm, pLevel, iTarget);
 4181              addrNotFound = pLevel->addrNxt;                                         4181              addrNotFound = pLevel->addrNxt;
 4182            }else{                                                                    4182            }else{
 4183              sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);                 4183              sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);
 4184            }                                                                         4184            }
 4185            break;                                                                    4185            break;