diff options
| author | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2015-04-16 03:24:38 +0000 |
| commit | fb383e9229461dd883852418b6489c091cdce3cd (patch) | |
| tree | e4ff7f3e1f80bbdaf23ead55a502796f58881aaa /src/select.c | |
| parent | 00eb70d89c427a6d0e86788346c8ddd6f93d6ec5 (diff) | |
| parent | 22ecef5c20e007ae5121d9febb3bb3d7f56097b0 (diff) | |
| download | sqlite-fb383e9229461dd883852418b6489c091cdce3cd.tar.gz sqlite-fb383e9229461dd883852418b6489c091cdce3cd.zip | |
Merge updates from trunk. Make OSTRACE changes work on Linux.
FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/select.c b/src/select.c index 8fd0f1591..bed1f80be 100644 --- a/src/select.c +++ b/src/select.c @@ -3071,7 +3071,7 @@ static int multiSelectOrderBy( /*** TBD: Insert subroutine calls to close cursors on incomplete **** subqueries ****/ explainComposite(pParse, p->op, iSub1, iSub2, 0); - return SQLITE_OK; + return pParse->nErr!=0; } #endif @@ -3883,7 +3883,10 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){ pNew->pOrderBy = 0; p->pPrior = 0; p->pNext = 0; + p->pWith = 0; p->selFlags &= ~SF_Compound; + assert( (p->selFlags & SF_Converted)==0 ); + p->selFlags |= SF_Converted; assert( pNew->pPrior!=0 ); pNew->pPrior->pNext = pNew; pNew->pLimit = 0; |