aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2012-10-09 01:39:25 +0000
committerdrh <drh@noemail.net>2012-10-09 01:39:25 +0000
commit86257fff8733e6c52bb355cf5bfee31dcc896aa3 (patch)
tree75850a9de7ea2a0e167ad3421e1a6474bfda9d4a /src
parent69a76bad73257518a051b628515c5ae3405c9948 (diff)
downloadsqlite-86257fff8733e6c52bb355cf5bfee31dcc896aa3.tar.gz
sqlite-86257fff8733e6c52bb355cf5bfee31dcc896aa3.zip
Remove an unused variable. Fix code that occurs before a variable
declaration. FossilOrigin-Name: 01dc032b5bbd9c9ebb1965f176ca5d732cda85ea
Diffstat (limited to 'src')
-rw-r--r--src/where.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/where.c b/src/where.c
index 1a15897f4..f9deb3d41 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3065,12 +3065,6 @@ static void bestBtreeIndex(WhereBestIdx *p){
const tRowcnt * const aiRowEst = pProbe->aiRowEst;
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 */
-
- WHERETRACE((
- " %s(%s):\n",
- pSrc->pTab->zName, (pIdx ? pIdx->zName : "ipk")
- ));
/* The following variables are populated based on the properties of
** index being evaluated. They are then used to determine the expected
@@ -3152,6 +3146,10 @@ static void bestBtreeIndex(WhereBestIdx *p){
WhereTerm *pFirstTerm = 0; /* First term matching the index */
#endif
+ WHERETRACE((
+ " %s(%s):\n",
+ pSrc->pTab->zName, (pIdx ? pIdx->zName : "ipk")
+ ));
memset(&pc, 0, sizeof(pc));
nOrderBy = p->pOrderBy ? p->pOrderBy->nExpr : 0;
if( p->i ){
@@ -3238,7 +3236,6 @@ static void bestBtreeIndex(WhereBestIdx *p){
** in pc.plan.wsFlags. Otherwise, if there is an ORDER BY clause but
** the index will scan rows in a different order, set the bSort
** variable. */
- assert( bRev>=0 && bRev<=2 );
if( bSort && (pSrc->jointype & JT_LEFT)==0 ){
int bRev = 2;
WHERETRACE((" --> before isSortingIndex: nPriorSat=%d\n",nPriorSat));