database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Merge fixes from trunk.

Browse Source 
FossilOrigin-Name: dd39418ee47529cc3ffbe01eccf31f1304a266a196bf81a2a2cb2e650c195b97
This commit is contained in:
drh
2020-07-23 14:27:51 +00:00
parent ed109c06e1 2add24c0d4
commit a92eae9751
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/select.c
View File

@@ -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 );