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 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/where.c
View File

@@ -47,6 +47,7 @@ int sqlite3WhereIsOrdered(WhereInfo *pWInfo){
** immediately with the next row of a WHERE clause.
*/
int sqlite3WhereContinueLabel(WhereInfo *pWInfo){
assert( pWInfo->iContinue!=0 );
return pWInfo->iContinue;
}
@@ -5471,7 +5472,7 @@ WhereInfo *sqlite3WhereBegin(
pWInfo->pTabList = pTabList;
pWInfo->pOrderBy = pOrderBy;
pWInfo->pResultSet = pResultSet;
pWInfo->iBreak = sqlite3VdbeMakeLabel(v);
pWInfo->iBreak = pWInfo->iContinue = sqlite3VdbeMakeLabel(v);
pWInfo->wctrlFlags = wctrlFlags;
pWInfo->savedNQueryLoop = pParse->nQueryLoop;
pMaskSet = &pWInfo->sMaskSet;