Fix a minor problem in sqlite3FindInIndex() related to rowids being used

as part of the index.

FossilOrigin-Name: 829f802be7d4647dd815b739bbc9e1d1ac6a224d

diff --git a/manifest b/manifest
index 05accaa53d60d98f165811243f8f885f45ad2d5e..f0a6286386699a4eff0ecbdb961d54df34a04943 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\ssqlite3FindInIndex()\sto\sensure\sthat\sit\salways\suses\sa\sprefix\sof\nthe\sindex\sand\suses\sno\srepeated\scolumns.\s\sEnhanced\scomments.
-D 2016-08-26T21:15:35.199
+C Fix\sa\sminor\sproblem\sin\ssqlite3FindInIndex()\srelated\sto\srowids\sbeing\sused\nas\spart\sof\sthe\sindex.
+D 2016-08-26T22:09:01.711
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -338,7 +338,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 4c80148f83127862f69ff509fb0aa261396df24e
+F src/expr.c 6ac2955b85fb32934b5505904da3d4be39d5d877
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1521,7 +1521,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 171aa833a2e1650c3d9cf9bd6438ae46f6c35871
-R 94dfe8764b4b5e69457ee17a8ecdc781
+P b9fc89e432fbe4e5b41959a42797641907e075e3
+R 4de3e6777e68cb197039afe2926927d7
 U drh
-Z ef81f77fdd077e1b395585c253a1bf6f
+Z 2cb9a82dfc67b60efaaa214dda6ee177

diff --git a/manifest.uuid b/manifest.uuid
index e5a0ab8485f840b7f4b3b408dd6f5fa13e1527df..407491af3549fed2374c95d14a06852a1016d0c3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9fc89e432fbe4e5b41959a42797641907e075e3
\ No newline at end of file
+829f802be7d4647dd815b739bbc9e1d1ac6a224d
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 8ede47731f594514897baca6011d173d6efd7c82..8e74fff61bbbf7935722498c8702a613fb646428 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2220,8 +2220,9 @@ int sqlite3FindInIndex(
             for(j=0; j<nExpr; j++){
               if( pIdx->aiColumn[j]!=pRhs->iColumn ) continue;
               assert( pIdx->azColl[j] );
-              if( pReq==0 ) continue;
-              if( sqlite3StrICmp(pReq->zName, pIdx->azColl[j])!=0 ) continue;
+              if( pReq!=0 && sqlite3StrICmp(pReq->zName, pIdx->azColl[j])!=0 ){
+                continue;
+              }
               break;
             }
             if( j==nExpr ) break;