diff options
| author | drh <drh@noemail.net> | 2018-01-04 19:54:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-01-04 19:54:55 +0000 |
| commit | c76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2 (patch) | |
| tree | 111c4a7f9be0604bb90f3fba54f2a71faded8a4b /src/where.c | |
| parent | 0cde0c62b1e53c01d72a9a9227010e6afc4032dc (diff) | |
| parent | 35100fb194cfbaf75b31b504e7bf7d4480900c26 (diff) | |
| download | sqlite-c76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2.tar.gz sqlite-c76ed3d57dfbe7b1080f362a7a59ea6ee25e6bb2.zip | |
Merge in all recent trunk enhancements.
FossilOrigin-Name: 406f79183736b6ad360169b837172afef2c82a4312f5787db08c54167a44b15e
Diffstat (limited to 'src/where.c')
| -rw-r--r-- | src/where.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/where.c b/src/where.c index d3aec354b..ec5352794 100644 --- a/src/where.c +++ b/src/where.c @@ -5146,7 +5146,11 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ pOp = sqlite3VdbeGetOp(v, k); for(; k<last; k++, pOp++){ if( pOp->p1!=pLevel->iTabCur ) continue; - if( pOp->opcode==OP_Column ){ + if( pOp->opcode==OP_Column +#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC + || pOp->opcode==OP_Offset +#endif + ){ int x = pOp->p2; assert( pIdx->pTable==pTab ); if( !HasRowid(pTab) ){ |