database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix an always-true conditional left over from the previous commit.

Browse Source 
FossilOrigin-Name: ab12fce3318db447995e1465f34a1e43cd623d6a
This commit is contained in:
drh
2016-09-30 21:20:37 +00:00
parent 9b40d13f43
commit 94881d732b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\sParse.aColCache\scolumn\scache\sso\sthat\sall\sof\sthe\svalid\sentries\sare\s\nin\sthe\sfirst\sParse.nColCache\sslots. C Fix\san\salways-true\sconditional\sleft\sover\sfrom\sthe\sprevious\scommit.
D 2016-09-30T20:22:27.729 D 2016-09-30T21:20:37.770
F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -339,7 +339,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
F src/expr.c f0ea2e1a7af0047b71e40dfed6902249129710e5 F src/expr.c ebb5174d26a653a7a6f5f300840352c7db932d86
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80 F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1525,7 +1525,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P c1419727f5e4cb3ef63b5853b6ef3b1e53af0651 P 6028502059ccbd3699637b7a70a6d8ce1b7c3dad
R 1c5f450e057ea86e47df56b91a0fd28e R a6256cdf36804c151ce32af7b8e56062
U drh U drh
Z 0c5e41f0df0638c8d6aea45323876192 Z 3fef1d146c2cf0fe38cc3824ec800a2a

2
manifest.uuid
View File

@@ -1 +1 @@
6028502059ccbd3699637b7a70a6d8ce1b7c3dad ab12fce3318db447995e1465f34a1e43cd623d6a

2
src/expr.c
View File

@@ -3176,7 +3176,7 @@ int sqlite3ExprCodeGetColumn(
struct yColCache *p; struct yColCache *p;
for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){ for(i=0, p=pParse->aColCache; i<pParse->nColCache; i++, p++){
if( p->iReg>0 && p->iTable==iTable && p->iColumn==iColumn ){ if( p->iTable==iTable && p->iColumn==iColumn ){
p->lru = pParse->iCacheCnt++; p->lru = pParse->iCacheCnt++;
sqlite3ExprCachePinRegister(pParse, p->iReg); sqlite3ExprCachePinRegister(pParse, p->iReg);
return p->iReg; return p->iReg;