diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/where.c | 3 | ||||
-rw-r--r-- | src/wherecode.c | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/where.c b/src/where.c index 93984347b..95bea115d 100644 --- a/src/where.c +++ b/src/where.c @@ -6948,9 +6948,8 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ assert( pSrc->pTab!=0 ); m = pSrc->pTab->nCol; sqlite3VdbeAddOp3(v, OP_Null, 0, n, n+m-1); - }else{ - sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->iTabCur); } + sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->iTabCur); } if( (ws & WHERE_INDEXED) || ((ws & WHERE_MULTI_OR) && pLevel->u.pCoveringIdx) diff --git a/src/wherecode.c b/src/wherecode.c index cad2293dd..d95eae279 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -2739,13 +2739,11 @@ SQLITE_NOINLINE void sqlite3WhereRightJoinLoop( v, OP_Null, 0, pRight->regResult, pRight->regResult + pRight->pSelect->pEList->nExpr-1 ); - sqlite3VdbeAddOp1(v, OP_OpenPseudo, pWInfo->a[k].iTabCur); - }else{ - sqlite3VdbeAddOp1(v, OP_NullRow, pWInfo->a[k].iTabCur); - iIdxCur = pWInfo->a[k].iIdxCur; - if( iIdxCur ){ - sqlite3VdbeAddOp1(v, OP_NullRow, iIdxCur); - } + } + sqlite3VdbeAddOp1(v, OP_NullRow, pWInfo->a[k].iTabCur); + iIdxCur = pWInfo->a[k].iIdxCur; + if( iIdxCur ){ + sqlite3VdbeAddOp1(v, OP_NullRow, iIdxCur); } } if( (pTabItem->fg.jointype & JT_LTORJ)==0 ){ |