diff options
| author | drh <drh@noemail.net> | 2014-05-29 20:24:20 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-05-29 20:24:20 +0000 |
| commit | ff14013496b17cb697d34b21574a9898a38bbd2c (patch) | |
| tree | 10d8dc7da780b6dd056f1943cb4abc527436f882 /ext | |
| parent | 79045882c94a21ddb2c2f829d0a515266555f527 (diff) | |
| parent | b463fef3fda4d233ba634d81bfc9c3bf001f0513 (diff) | |
| download | sqlite-ff14013496b17cb697d34b21574a9898a38bbd2c.tar.gz sqlite-ff14013496b17cb697d34b21574a9898a38bbd2c.zip | |
Merge changes from the trunk into the threads branch.
FossilOrigin-Name: 416cb091267de91b9cadee9f7453b8627570b7d3
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/fts3/fts3.c | 2 | ||||
| -rw-r--r-- | ext/fts3/fts3_expr.c | 2 | ||||
| -rw-r--r-- | ext/fts3/fts3_write.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 318a92708..1676fd41e 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -1376,7 +1376,7 @@ static int fts3InitVtab( int n = (int)strlen(p->azColumn[iCol]); for(i=0; i<nNotindexed; i++){ char *zNot = azNotindexed[i]; - if( zNot && strlen(zNot)==n + if( zNot && n==(int)strlen(zNot) && 0==sqlite3_strnicmp(p->azColumn[iCol], zNot, n) ){ p->abNotindexed[iCol] = 1; diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c index 95a9b1aad..f5d28cbfc 100644 --- a/ext/fts3/fts3_expr.c +++ b/ext/fts3/fts3_expr.c @@ -502,7 +502,7 @@ static int getNextNode( return rc; }else if( *zInput==')' ){ pParse->nNest--; - *pnConsumed = (zInput - z) + 1; + *pnConsumed = (int)((zInput - z) + 1); *ppExpr = 0; return SQLITE_DONE; } diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c index ea3c08802..72df64f26 100644 --- a/ext/fts3/fts3_write.c +++ b/ext/fts3/fts3_write.c @@ -3065,7 +3065,7 @@ static int fts3PromoteSegments( sqlite3_bind_int64(pRange, 1, iAbsLevel+1); sqlite3_bind_int64(pRange, 2, iLast); while( SQLITE_ROW==sqlite3_step(pRange) ){ - i64 nSize, dummy; + i64 nSize = 0, dummy; fts3ReadEndBlockField(pRange, 2, &dummy, &nSize); if( nSize<=0 || nSize>nLimit ){ /* If nSize==0, then the %_segdir.end_block field does not not @@ -4870,7 +4870,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){ rc = fts3IncrmergeOutputIdx(p, iAbsLevel, &iIdx); assert( bUseHint==1 || bUseHint==0 ); if( iIdx==0 || (bUseHint && iIdx==1) ){ - int bIgnore; + int bIgnore = 0; rc = fts3SegmentIsMaxLevel(p, iAbsLevel+1, &bIgnore); if( bIgnore ){ pFilter->flags |= FTS3_SEGMENT_IGNORE_EMPTY; |