diff options
author | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-04-18 01:10:05 +0000 |
commit | a1a483d54e39272c16b5fa94e97578ccddee6a8a (patch) | |
tree | b28bb3ea6cdff4cdefa08c26c870e415e996c730 /src/vdbe.c | |
parent | 652cc4b6dca02426e8d375a962bf8417850d9f7a (diff) | |
parent | 71794dbaeb73f594ef704fa265715b207f98edc7 (diff) | |
download | sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.tar.gz sqlite-a1a483d54e39272c16b5fa94e97578ccddee6a8a.zip |
Merge recent trunk changes into sessions.
FossilOrigin-Name: 95e77efe076ab421bd246119c47dba5dacf9d087
Diffstat (limited to 'src/vdbe.c')
-rw-r--r-- | src/vdbe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index e16639690..1822c807e 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -5288,9 +5288,7 @@ case OP_RowSetTest: { /* jump, in1, in3 */ assert( pOp->p4type==P4_INT32 ); assert( iSet==-1 || iSet>=0 ); if( iSet ){ - exists = sqlite3RowSetTest(pIn1->u.pRowSet, - (u8)(iSet>=0 ? iSet & 0xf : 0xff), - pIn3->u.i); + exists = sqlite3RowSetTest(pIn1->u.pRowSet, iSet, pIn3->u.i); VdbeBranchTaken(exists!=0,2); if( exists ){ pc = pOp->p2 - 1; |