diff options
| author | drh <drh@noemail.net> | 2020-07-23 14:12:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-07-23 14:12:47 +0000 |
| commit | 2add24c0d4b467edd0a449c90d305e46dfd6d7a6 (patch) | |
| tree | 147aaf718d5458a703011951a0ffdb2185c37884 /src | |
| parent | 9d44327a83c28bcb743034e5761951e785d57a28 (diff) | |
| download | sqlite-2add24c0d4b467edd0a449c90d305e46dfd6d7a6.tar.gz sqlite-2add24c0d4b467edd0a449c90d305e46dfd6d7a6.zip | |
An ORDER BY clause can slip into an SRT_Upfrom query via the query
flattener, even without the SQLITE_ENABLE_UPDATE_DELETE_LIMIT compile-time
option. So always enable the code to deal with that case.
FossilOrigin-Name: 6a3111cd0693bb51191d55a32ecd436341638d54ecb2df0778de681b4969241b
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/select.c b/src/select.c index ebb764573..763b25412 100644 --- a/src/select.c +++ b/src/select.c @@ -1129,13 +1129,10 @@ static void selectInnerLoop( } case SRT_Upfrom: { -#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT if( pSort ){ pushOntoSorter( pParse, pSort, p, regResult, regOrig, nResultCol, nPrefixReg); - }else -#endif - { + }else{ int i2 = pDest->iSDParm2; int r1 = sqlite3GetTempReg(pParse); @@ -1587,7 +1584,6 @@ static void generateSortTail( break; } #endif -#ifdef SQLITE_ENABLE_UPDATE_DELETE_LIMIT case SRT_Upfrom: { int i2 = pDest->iSDParm2; int r1 = sqlite3GetTempReg(pParse); @@ -1599,7 +1595,6 @@ static void generateSortTail( } break; } -#endif default: { assert( eDest==SRT_Output || eDest==SRT_Coroutine ); testcase( eDest==SRT_Output ); |