diff options
| author | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-11-18 21:20:57 +0000 |
| commit | 04e8a5866948996e4dd1540a9a736d00609c27e8 (patch) | |
| tree | fcf53188c46e77ce3d90818bc17e118298813b18 /src/expr.c | |
| parent | ca3e10ea37c4808fa84063f06b02229801b28cc0 (diff) | |
| parent | 64b600ff13d4bac1d459cf54b649b45e520aba4c (diff) | |
| download | sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.tar.gz sqlite-04e8a5866948996e4dd1540a9a736d00609c27e8.zip | |
Merge recent trunk enhancements, including the read-after-ROLLBACK change
and the addition of sqlite3_stmt_scanstatus() support, as well as various
minor bug fixes.
FossilOrigin-Name: f09055f3c4348264c7336f90646375f0d98b061e
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index 13a9cb46f..25f0be400 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1857,7 +1857,6 @@ int sqlite3CodeSubselect( assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable ); pSelect->iLimit = 0; testcase( pSelect->selFlags & SF_Distinct ); - pSelect->selFlags &= ~SF_Distinct; testcase( pKeyInfo==0 ); /* Caused by OOM in sqlite3KeyInfoAlloc() */ if( sqlite3Select(pParse, pSelect, &dest) ){ sqlite3KeyInfoUnref(pKeyInfo); |