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

FossilOrigin-Name: ab12fce3318db447995e1465f34a1e43cd623d6a

diff --git a/manifest b/manifest
index 5681d1db00e495f6be2d6520ee2d529bfb178ee5..03624a18e0bffe1d461851f5e60b9e97614e34dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -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.
-D 2016-09-30T20:22:27.729
+C Fix\san\salways-true\sconditional\sleft\sover\sfrom\sthe\sprevious\scommit.
+D 2016-09-30T21:20:37.770
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -339,7 +339,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
-F src/expr.c f0ea2e1a7af0047b71e40dfed6902249129710e5
+F src/expr.c ebb5174d26a653a7a6f5f300840352c7db932d86
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c b9ca262f6ad4d030a3cab737ebf9b0b3c8b4ac80
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1525,7 +1525,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 c1419727f5e4cb3ef63b5853b6ef3b1e53af0651
-R 1c5f450e057ea86e47df56b91a0fd28e
+P 6028502059ccbd3699637b7a70a6d8ce1b7c3dad
+R a6256cdf36804c151ce32af7b8e56062
 U drh
-Z 0c5e41f0df0638c8d6aea45323876192
+Z 3fef1d146c2cf0fe38cc3824ec800a2a

diff --git a/manifest.uuid b/manifest.uuid
index 423c99ffef749de9341fcd771e0e35181f8840e6..1de6344050e97860101ce2f19520b75666ab2411 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6028502059ccbd3699637b7a70a6d8ce1b7c3dad
\ No newline at end of file
+ab12fce3318db447995e1465f34a1e43cd623d6a
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 0640029cb0052daf0416dc0c77acb9320d51e98e..31128cc3d462c5615a27fc351340b33bd5cc7537 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3176,7 +3176,7 @@ int sqlite3ExprCodeGetColumn(
   struct yColCache *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++;
       sqlite3ExprCachePinRegister(pParse, p->iReg);
       return p->iReg;