diff options
| author | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-04-15 14:14:38 +0000 |
| commit | ff363ee1217d79e8988a16ef0d72e5ee1729dc48 (patch) | |
| tree | ad4bf050eb315f2742224500d564bb8918458bf5 /src/expr.c | |
| parent | df3c171881b4ee77003b9d7e287220c22dbc97a2 (diff) | |
| parent | 0d01ec8de83b4e0d7523d67c5f92a44f0ba79b8e (diff) | |
| download | sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.tar.gz sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.zip | |
Merge all recent trunk fixes and enhancements into the sessions branch.
FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index e6ac0f679..77eb35aa7 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1691,7 +1691,7 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, u32 inFlags, int *prRhsHasNull){ ** ephemeral table. */ p = (ExprHasProperty(pX, EP_xIsSelect) ? pX->x.pSelect : 0); - if( ALWAYS(pParse->nErr==0) && isCandidateForInOpt(p) ){ + if( pParse->nErr==0 && isCandidateForInOpt(p) ){ sqlite3 *db = pParse->db; /* Database connection */ Table *pTab; /* Table <table>. */ Expr *pExpr; /* Expression <column> */ @@ -2016,6 +2016,7 @@ int sqlite3CodeSubselect( pSel->pLimit = sqlite3PExpr(pParse, TK_INTEGER, 0, 0, &sqlite3IntTokens[1]); pSel->iLimit = 0; + pSel->selFlags &= ~SF_AllValues; if( sqlite3Select(pParse, pSel, &dest) ){ return 0; } |