diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbe.c | 6 | ||||
| -rw-r--r-- | src/whereInt.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 5b8b1372b..b677285a4 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -7928,6 +7928,12 @@ default: { /* This is really OP_Noop, OP_Explain */ if( opProperty & OPFLG_OUT3 ){ registerTrace(pOrigOp->p3, &aMem[pOrigOp->p3]); } + if( opProperty==0xff ){ + /* Never happens. This code exists to avoid a harmless linkage + ** warning aboud sqlite3VdbeRegisterDump() being defined but not + ** used. */ + sqlite3VdbeRegisterDump(p); + } } #endif /* SQLITE_DEBUG */ #endif /* NDEBUG */ diff --git a/src/whereInt.h b/src/whereInt.h index ad433652f..dbc6f1872 100644 --- a/src/whereInt.h +++ b/src/whereInt.h @@ -473,10 +473,10 @@ struct WhereInfo { i8 nOBSat; /* Number of ORDER BY terms satisfied by indices */ u8 eOnePass; /* ONEPASS_OFF, or _SINGLE, or _MULTI */ u8 eDistinct; /* One of the WHERE_DISTINCT_* values */ - u8 bDeferredSeek : 1; /* Uses OP_DeferredSeek */ - u8 untestedTerms : 1; /* Not all WHERE terms resolved by outer loop */ - u8 bOrderedInnerLoop : 1; /* True if only the inner-most loop is ordered */ - u8 sorted : 1; /* True if really sorted (not just grouped) */ + unsigned bDeferredSeek :1; /* Uses OP_DeferredSeek */ + unsigned untestedTerms :1; /* Not all WHERE terms resolved by outer loop */ + unsigned bOrderedInnerLoop:1;/* True if only the inner-most loop is ordered */ + unsigned sorted :1; /* True if really sorted (not just grouped) */ LogEst nRowOut; /* Estimated number of output rows */ int iTop; /* The very beginning of the WHERE loop */ WhereLoop *pLoops; /* List of all WhereLoop objects */ |