database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00
Code Activity

Fix an out-of-order memset() that occurs before all variable declarations

Browse Source 
are finished.  Also fix a line that exceeds the 80-character line length
limit.

FossilOrigin-Name: ba2f492f957ab5556cd540e21a76ebb75efea725
This commit is contained in:
drh
2012-10-03 18:09:32 +00:00
parent 325eff58d6
commit 613a53a029
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/where.c
View File

@@ -3067,7 +3067,6 @@ static void bestBtreeIndex(WhereBestIdx *p){
WhereCost pc; /* Cost of using pProbe */
double log10N = (double)1; /* base-10 logarithm of nRow (inexact) */
int bRev = 2; /* 0=forward scan. 1=reverse. 2=undecided */
memset(&pc, 0, sizeof(pc));
/* The following variables are populated based on the properties of
** index being evaluated. They are then used to determine the expected
@@ -3154,6 +3153,7 @@ static void bestBtreeIndex(WhereBestIdx *p){
WhereTerm *pFirstTerm = 0; /* First term matching the index */
#endif
memset(&pc, 0, sizeof(pc));
nOrderBy = p->pOrderBy ? p->pOrderBy->nExpr : 0;
if( p->i ){
nPriorSat = pc.plan.nOBSat = p->aLevel[p->i-1].plan.nOBSat;
@@ -3186,7 +3186,8 @@ static void bestBtreeIndex(WhereBestIdx *p){
}else if( pTerm->eOperator & WO_ISNULL ){
pc.plan.wsFlags |= WHERE_COLUMN_NULL;
if( pc.plan.nEq==nOrdered ) nOrdered++;
}else if( bSort && pc.plan.nEq==nOrdered && isOrderedTerm(p, pTerm, &bRev) ){
}else if( bSort && pc.plan.nEq==nOrdered
&& isOrderedTerm(p,pTerm,&bRev) ){
nOrdered++;
}
#ifdef SQLITE_ENABLE_STAT3