Fix out-of-order variable declaration. Fix harmless compiler warning.

FossilOrigin-Name: 8df95bb0b3f72222cf262174247a467c234f9939
This commit is contained in:
mistachkin
2013-09-04 04:04:08 +00:00
parent 30f07042df
commit c2cfb51525
4 changed files with 16 additions and 14 deletions
+2
View File
@@ -524,7 +524,9 @@ static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
/* Zero the first nEqZero entries in the anEq[] array. */
memset(pSample->anEq, 0, sizeof(tRowcnt)*nEqZero);
#ifdef SQLITE_ENABLE_STAT4
find_new_min:
#endif
if( p->nSample>=p->mxSample ){
int iMin = -1;
for(i=0; i<p->mxSample; i++){
+5 -5
View File
@@ -2557,11 +2557,6 @@ static int whereRangeScanEst(
UnpackedRecord *pRec = pBuilder->pRec;
tRowcnt a[2];
u8 aff;
if( nEq==p->nColumn ){
aff = SQLITE_AFF_INTEGER;
}else{
aff = p->pTable->aCol[p->aiColumn[nEq]].affinity;
}
/* Variable iLower will be set to the estimate of the number of rows in
** the index that are less than the lower bound of the range query. The
@@ -2583,6 +2578,11 @@ static int whereRangeScanEst(
tRowcnt iLower;
tRowcnt iUpper;
if( nEq==p->nColumn ){
aff = SQLITE_AFF_INTEGER;
}else{
aff = p->pTable->aCol[p->aiColumn[nEq]].affinity;
}
/* Determine iLower and iUpper using ($P) only. */
if( nEq==0 ){
iLower = 0;