Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Changes to remove warnings in MSVC build. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6cf76c2ae25d6e58926637ecd42eed6b |
| User & Date: | shaneh 2009-12-31 19:06:24 |
Context
|
2009-12-31
| ||
| 19:48 | Minor changes to test scripts to support various SQLITE_OMIT options. check-in: 97f8a886 user: shaneh tags: trunk | |
| 19:06 | Changes to remove warnings in MSVC build. check-in: 6cf76c2a user: shaneh tags: trunk | |
| 15:51 | Change evidence marks to track requirement number changes in the foreign-key documentation. check-in: 6b4fcd81 user: drh tags: trunk | |
Changes
Changes to ext/fts3/fts3.c.
2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 |
}
if( pInfo->flags&FTS3_MATCHINFO_POSITIONLIST ){
int nLocal = 0;
sqlite3_int64 iOffset = 0;
char *pList = pExpr->pCurrent;
while( *pList&0xFE ){
fts3GetDeltaVarint(&pList, &iOffset); iOffset -= 2;
fts3MatchInfoAppend(pInfo, iOffset+1-nPhrase);
nLocal++;
}
pExpr->pCurrent = pList;
pInfo->aOut[iLocalOff] = nLocal;
}else{
pInfo->aOut[iLocalOff] = fts3ColumnlistCount(&pExpr->pCurrent);
}
|
| > | |
2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 |
}
if( pInfo->flags&FTS3_MATCHINFO_POSITIONLIST ){
int nLocal = 0;
sqlite3_int64 iOffset = 0;
char *pList = pExpr->pCurrent;
while( *pList&0xFE ){
fts3GetDeltaVarint(&pList, &iOffset);
iOffset -= 2;
fts3MatchInfoAppend(pInfo, (unsigned int)(iOffset+1-nPhrase));
nLocal++;
}
pExpr->pCurrent = pList;
pInfo->aOut[iLocalOff] = nLocal;
}else{
pInfo->aOut[iLocalOff] = fts3ColumnlistCount(&pExpr->pCurrent);
}
|
Changes to src/where.c.
3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 |
if( pWInfo->nLevel>1 ){
int nNotReady; /* The number of notReady tables */
struct SrcList_item *origSrc; /* Original list of tables */
nNotReady = pWInfo->nLevel - iLevel - 1;
pOrTab = sqlite3StackAllocRaw(pParse->db,
sizeof(*pOrTab)+ nNotReady*sizeof(pOrTab->a[0]));
if( pOrTab==0 ) return notReady;
pOrTab->nSrc = pOrTab->nAlloc = nNotReady + 1;
memcpy(pOrTab->a, pTabItem, sizeof(*pTabItem));
origSrc = pWInfo->pTabList->a;
for(k=1; k<=nNotReady; k++){
memcpy(&pOrTab->a[k], &origSrc[pLevel[k].iFrom], sizeof(pOrTab->a[k]));
}
}else{
pOrTab = pWInfo->pTabList;
|
> | |
3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 |
if( pWInfo->nLevel>1 ){
int nNotReady; /* The number of notReady tables */
struct SrcList_item *origSrc; /* Original list of tables */
nNotReady = pWInfo->nLevel - iLevel - 1;
pOrTab = sqlite3StackAllocRaw(pParse->db,
sizeof(*pOrTab)+ nNotReady*sizeof(pOrTab->a[0]));
if( pOrTab==0 ) return notReady;
pOrTab->nAlloc = (i16)(nNotReady + 1);
pOrTab->nSrc = pOrTab->nAlloc;
memcpy(pOrTab->a, pTabItem, sizeof(*pTabItem));
origSrc = pWInfo->pTabList->a;
for(k=1; k<=nNotReady; k++){
memcpy(&pOrTab->a[k], &origSrc[pLevel[k].iFrom], sizeof(pOrTab->a[k]));
}
}else{
pOrTab = pWInfo->pTabList;
|