diff options
| author | drh <drh@noemail.net> | 2012-08-24 23:24:15 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-08-24 23:24:15 +0000 |
| commit | d40e208726918b770586cb0bf5cf7edabc17ee2a (patch) | |
| tree | e00b3ddd6b0f816f04ddac7e2a4a2d85b933a33e /src | |
| parent | 7b36ba3da319786dea5deab70c8f8181ebdc2f8f (diff) | |
| download | sqlite-d40e208726918b770586cb0bf5cf7edabc17ee2a.tar.gz sqlite-d40e208726918b770586cb0bf5cf7edabc17ee2a.zip | |
Move field WhereLevel.pCovidx inside the union to WhereLevel.u.pCovidx.
FossilOrigin-Name: b722143d075979ba3d92b7b29e576ce2307187d1
Diffstat (limited to 'src')
| -rw-r--r-- | src/sqliteInt.h | 2 | ||||
| -rw-r--r-- | src/where.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index aa554a23a..19cd05eeb 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1947,8 +1947,8 @@ struct WhereLevel { int addrInTop; /* Top of the IN loop */ } *aInLoop; /* Information about each nested IN operator */ } in; /* Used when plan.wsFlags&WHERE_IN_ABLE */ + Index *pCovidx; /* Possible covering index for WHERE_MULTI_OR */ } u; - Index *pCovidx; /* Possible covering index for WHERE_MULTI_OR levels */ /* The following field is really not part of the current level. But ** we need a place to cache virtual table index information for each diff --git a/src/where.c b/src/where.c index 27fb0f8fc..a460abc2d 100644 --- a/src/where.c +++ b/src/where.c @@ -4446,7 +4446,7 @@ static Bitmask codeOneLoopStart( } } } - pLevel->pCovidx = pCov; + pLevel->u.pCovidx = pCov; pLevel->iIdxCur = iCovCur; if( pAndExpr ){ pAndExpr->pLeft = 0; @@ -5277,7 +5277,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ if( pLevel->plan.wsFlags & WHERE_INDEXED ){ pIdx = pLevel->plan.u.pIdx; }else if( pLevel->plan.wsFlags & WHERE_MULTI_OR ){ - pIdx = pLevel->pCovidx; + pIdx = pLevel->u.pCovidx; } if( pIdx && !db->mallocFailed){ int k, j, last; |