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

Merge the OFFSET-on-query-without-FROM fix from trunk.

Browse Source 
FossilOrigin-Name: 71e9ae72c272dc86720b2bfe719f57de437c400b
This commit is contained in:
drh
2014-03-21 18:45:19 +00:00
parent e99b9cdc70 a22a75e5ca
commit cc08fa48b8
5 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/select.c
View File

@@ -537,7 +537,7 @@ static void codeOffset(
int iOffset, /* Register holding the offset counter */
int iContinue /* Jump here to skip the current record */
){
if( iOffset>0 && iContinue!=0 ){
if( iOffset>0 ){
int addr;
sqlite3VdbeAddOp2(v, OP_AddImm, iOffset, -1);
addr = sqlite3VdbeAddOp1(v, OP_IfNeg, iOffset); VdbeCoverage(v);
@@ -631,6 +631,7 @@ static void selectInnerLoop(
hasDistinct = pDistinct ? pDistinct->eTnctType : WHERE_DISTINCT_NOOP;
if( pSort && pSort->pOrderBy==0 ) pSort = 0;
if( pSort==0 && !hasDistinct ){
assert( iContinue!=0 );
codeOffset(v, p->iOffset, iContinue);
}