diff options
| author | drh <drh@noemail.net> | 2016-09-09 15:12:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-09-09 15:12:41 +0000 |
| commit | b80dbdc2f740dd016a760e31f5835ecd48ab6579 (patch) | |
| tree | c20114584a435181e355ee81d0d7d2a0e8051b24 /src/expr.c | |
| parent | fe3765828a709ef730b667de42353cce5bca26f9 (diff) | |
| download | sqlite-b80dbdc2f740dd016a760e31f5835ecd48ab6579.tar.gz sqlite-b80dbdc2f740dd016a760e31f5835ecd48ab6579.zip | |
Fix a out-of-order variable declaration for some compile-time configurations.
FossilOrigin-Name: 6ac932c92a61cd68cc5b1816216e4748a5c7b3cd
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expr.c b/src/expr.c index 80497be11..abae812ea 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2234,11 +2234,11 @@ int sqlite3FindInIndex( if( colUsed==(MASKBIT(nExpr)-1) ){ /* If we reach this point, that means the index pIdx is usable */ int iAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v); - #ifndef SQLITE_OMIT_EXPLAIN +#ifndef SQLITE_OMIT_EXPLAIN sqlite3VdbeAddOp4(v, OP_Explain, 0, 0, 0, sqlite3MPrintf(db, "USING INDEX %s FOR IN-OPERATOR",pIdx->zName), P4_DYNAMIC); - #endif +#endif sqlite3VdbeAddOp3(v, OP_OpenRead, iTab, pIdx->tnum, iDb); sqlite3VdbeSetP4KeyInfo(pParse, pIdx); VdbeComment((v, "%s", pIdx->zName)); @@ -2246,12 +2246,12 @@ int sqlite3FindInIndex( eType = IN_INDEX_INDEX_ASC + pIdx->aSortOrder[0]; if( prRhsHasNull ){ - *prRhsHasNull = ++pParse->nMem; - #ifdef SQLITE_ENABLE_COLUMN_USED_MASK +#ifdef SQLITE_ENABLE_COLUMN_USED_MASK i64 mask = (1<<nExpr)-1; sqlite3VdbeAddOp4Dup8(v, OP_ColumnsUsed, iTab, 0, 0, (u8*)&mask, P4_INT64); - #endif +#endif + *prRhsHasNull = ++pParse->nMem; if( nExpr==1 ){ sqlite3SetHasNullFlag(v, iTab, *prRhsHasNull); } |