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 | |
| 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
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/expr.c | 10 |
3 files changed, 12 insertions, 12 deletions
@@ -1,5 +1,5 @@ -C In\sreleasetest.tcl,\sthe\s--srcdir\soption\sis\sautomatic,\sso\sno\sneed\sto\smention\nit\sin\sthe\s--help\soutput. -D 2016-09-09T13:23:36.137 +C Fix\sa\sout-of-order\svariable\sdeclaration\sfor\ssome\scompile-time\sconfigurations. +D 2016-09-09T15:12:41.801 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c @@ -339,7 +339,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05 -F src/expr.c 028c34005cb804abe8f73453ac08baa44f4b63f9 +F src/expr.c c1de78269522de39f6ad877ab0810a5d48f91f34 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 @@ -1523,7 +1523,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P afaaa276b256f56adf63cb568e486cb3315c3ec2 -R d307f78f7d85e383c9266a539201664c +P 2bdd838e2c434f1d26b1836ef39fa938ef93131d +R cdaf391119a3a76bb49bf405a13f8694 U drh -Z 810b7b5c52fdba9d6e7019ea79310fb8 +Z f913482662ff429e344c363b85d81ce9 diff --git a/manifest.uuid b/manifest.uuid index f2bca1373..163d45392 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2bdd838e2c434f1d26b1836ef39fa938ef93131d
\ No newline at end of file +6ac932c92a61cd68cc5b1816216e4748a5c7b3cd
\ No newline at end of file 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); } |