aboutsummaryrefslogtreecommitdiff
path: root/src/select.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-04-04 16:43:16 +0000
committerdan <dan@noemail.net>2015-04-04 16:43:16 +0000
commitb33c50f215b45acd1b6f47008562e64d895d3fba (patch)
treedc7c0350a48cc6ef85460ddf4a148bf6fc304863 /src/select.c
parent62ca61ee61c379af19b2dd64cab29081216d2140 (diff)
downloadsqlite-b33c50f215b45acd1b6f47008562e64d895d3fba.tar.gz
sqlite-b33c50f215b45acd1b6f47008562e64d895d3fba.zip
Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached to compound SELECT statements.
FossilOrigin-Name: 427b50fba7362e5b447e79d39050f25ed2ef10af
Diffstat (limited to 'src/select.c')
-rw-r--r--src/select.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/select.c b/src/select.c
index 8fd0f1591..90aaa842a 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3884,6 +3884,8 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){
p->pPrior = 0;
p->pNext = 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;