database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-18 10:21:03 +03:00
Code Activity

Merge trunk changes with this branch.

Browse Source 
FossilOrigin-Name: 0e927a7e0250a65fd8e97b322cd69e93fadd13f0
This commit is contained in:
dan
2016-08-08 16:52:11 +00:00
parent 3d1fb1dd75 e22c375659
commit adeb970da2
25 changed files with 168 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/where.c
View File

@@ -4077,7 +4077,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
pWInfo->revMask = pFrom->revLoop;
if( pWInfo->nOBSat<=0 ){
pWInfo->nOBSat = 0;
if( nLoop>0 ){
if( nLoop>0 && (pFrom->aLoop[nLoop-1]->wsFlags & WHERE_ONEROW)==0 ){
Bitmask m = 0;
int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
WHERE_ORDERBY_LIMIT, nLoop-1, pFrom->aLoop[nLoop-1], &m);