Fossil SCM
Merged the latest changes from trunk.
Commit
72518c1239131bd1450a1b0c472ddae0111bf53d
Parent
836a89c5b250d1e…
1 file changed
+1
-1
+1
-1
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -148376,11 +148376,11 @@ | ||
| 148376 | 148376 | ** If the iCol argument to this function was negative, this means all |
| 148377 | 148377 | ** columns of the FTS3 table. Otherwise, only column iCol is considered. |
| 148378 | 148378 | */ |
| 148379 | 148379 | for(iRead=0; iRead<pTab->nColumn; iRead++){ |
| 148380 | 148380 | SnippetFragment sF = {0, 0, 0, 0}; |
| 148381 | - int iS; | |
| 148381 | + int iS = 0; | |
| 148382 | 148382 | if( iCol>=0 && iRead!=iCol ) continue; |
| 148383 | 148383 | |
| 148384 | 148384 | /* Find the best snippet of nFToken tokens in column iRead. */ |
| 148385 | 148385 | rc = fts3BestSnippet(nFToken, pCsr, iRead, mCovered, &mSeen, &sF, &iS); |
| 148386 | 148386 | if( rc!=SQLITE_OK ){ |
| 148387 | 148387 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -148376,11 +148376,11 @@ | |
| 148376 | ** If the iCol argument to this function was negative, this means all |
| 148377 | ** columns of the FTS3 table. Otherwise, only column iCol is considered. |
| 148378 | */ |
| 148379 | for(iRead=0; iRead<pTab->nColumn; iRead++){ |
| 148380 | SnippetFragment sF = {0, 0, 0, 0}; |
| 148381 | int iS; |
| 148382 | if( iCol>=0 && iRead!=iCol ) continue; |
| 148383 | |
| 148384 | /* Find the best snippet of nFToken tokens in column iRead. */ |
| 148385 | rc = fts3BestSnippet(nFToken, pCsr, iRead, mCovered, &mSeen, &sF, &iS); |
| 148386 | if( rc!=SQLITE_OK ){ |
| 148387 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -148376,11 +148376,11 @@ | |
| 148376 | ** If the iCol argument to this function was negative, this means all |
| 148377 | ** columns of the FTS3 table. Otherwise, only column iCol is considered. |
| 148378 | */ |
| 148379 | for(iRead=0; iRead<pTab->nColumn; iRead++){ |
| 148380 | SnippetFragment sF = {0, 0, 0, 0}; |
| 148381 | int iS = 0; |
| 148382 | if( iCol>=0 && iRead!=iCol ) continue; |
| 148383 | |
| 148384 | /* Find the best snippet of nFToken tokens in column iRead. */ |
| 148385 | rc = fts3BestSnippet(nFToken, pCsr, iRead, mCovered, &mSeen, &sF, &iS); |
| 148386 | if( rc!=SQLITE_OK ){ |
| 148387 |