/ Check-in [7df43f48]
Login

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

Overview
Comment:Change the type of a variable in struct SrcList so that it fits in a 100 byte lookaside buffer on a 64-bit architecture.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:7df43f4892e628ecb8a83c5ed2dce5e24f6dd529
User & Date: dan 2010-12-01 19:00:48
Context
2010-12-01
20:49
Added TCL test case for converting to WAL mode with multiple connections. Added exception to the test case for Windows for not being able to delete the open journal file. check-in: 7061601f user: shaneh tags: trunk
19:00
Change the type of a variable in struct SrcList so that it fits in a 100 byte lookaside buffer on a 64-bit architecture. check-in: 7df43f48 user: dan tags: trunk
15:36
Fix some warnings under MSVC in fts3 module. check-in: c7771c0b user: shaneh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

configure became executable.


install-sh became executable.


Changes to src/select.c.

  3761   3761           isAgg = 1;
  3762   3762           p->selFlags |= SF_Aggregate;
  3763   3763         }
  3764   3764         i = -1;
  3765   3765       }else{
  3766   3766         sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
  3767   3767         assert( pItem->isPopulated==0 );
  3768         -      explainSetInteger(pItem->iSelectId, pParse->iNextSelectId);
         3768  +      explainSetInteger(pItem->iSelectId, (u8)pParse->iNextSelectId);
  3769   3769         sqlite3Select(pParse, pSub, &dest);
  3770   3770         pItem->isPopulated = 1;
  3771   3771         pItem->pTab->nRowEst = (unsigned)pSub->nSelectRow;
  3772   3772       }
  3773   3773       if( /*pParse->nErr ||*/ db->mallocFailed ){
  3774   3774         goto select_end;
  3775   3775       }

Changes to src/sqliteInt.h.

  1818   1818       char *zName;      /* Name of the table */
  1819   1819       char *zAlias;     /* The "B" part of a "A AS B" phrase.  zName is the "A" */
  1820   1820       Table *pTab;      /* An SQL table corresponding to zName */
  1821   1821       Select *pSelect;  /* A SELECT statement used in place of a table name */
  1822   1822       u8 isPopulated;   /* Temporary table associated with SELECT is populated */
  1823   1823       u8 jointype;      /* Type of join between this able and the previous */
  1824   1824       u8 notIndexed;    /* True if there is a NOT INDEXED clause */
         1825  +#ifndef SQLITE_OMIT_EXPLAIN
         1826  +    u8 iSelectId;     /* If pSelect!=0, the id of the sub-select in EQP */
         1827  +#endif
  1825   1828       int iCursor;      /* The VDBE cursor number used to access this table */
  1826   1829       Expr *pOn;        /* The ON clause of a join */
  1827   1830       IdList *pUsing;   /* The USING clause of a join */
  1828   1831       Bitmask colUsed;  /* Bit N (1<<N) set if column N of pTab is used */
  1829   1832       char *zIndex;     /* Identifier from "INDEXED BY <zIndex>" clause */
  1830   1833       Index *pIndex;    /* Index structure corresponding to zIndex, if any */
  1831         -#ifndef SQLITE_OMIT_EXPLAIN
  1832         -    int iSelectId;    /* If pSelect!=0, the id of the sub-select in EQP */
  1833         -#endif
  1834   1834     } a[1];             /* One entry for each identifier on the list */
  1835   1835   };
  1836   1836   
  1837   1837   /*
  1838   1838   ** Permitted values of the SrcList.a.jointype field
  1839   1839   */
  1840   1840   #define JT_INNER     0x0001    /* Any kind of inner or cross join */