Omit the unnecessary WHERE_REOPEN_IDX flag in the WHERE interface.
FossilOrigin-Name: da94a6e0ebacad8f235dcd653a25474327f26137
diff --git a/manifest b/manifest
index 8e82d94..cf88c90 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\scomment\sin\sfts5.h.\sNo\schanges\sto\scode.
-D 2016-05-09T19:03:42.623
+C Omit\sthe\sunnecessary\sWHERE_REOPEN_IDX\sflag\sin\sthe\sWHERE\sinterface.
+D 2016-05-09T19:58:56.729
F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
@@ -382,7 +382,7 @@
F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
-F src/sqliteInt.h 8ec741711b8f42aae2c7a22e3d04f15270e0b6be
+F src/sqliteInt.h 47a90c85a42210a05387051aaaa661f5c307703d
F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@ -457,9 +457,9 @@
F src/wal.c 4db22ed7e77bcf672b1a685d6ddeffba8d5be302
F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
-F src/where.c fd321cc2c5ee346a2e146b93892ed01bb7a839c0
+F src/where.c ad8ad50ccf25795f6830b6b864bbfcd060ff08dd
F src/whereInt.h 3b1fc240e322613ba4e9dc857ca9c7c3390acc74
-F src/wherecode.c 23fc19ca546ce323ba5c4be96b88e3ba08cf6b8f
+F src/wherecode.c d227fca7d766a10fe4ba4d812210f5631f5a98b3
F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -1487,7 +1487,10 @@
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 48505cde05d74748454dc135d4ec25954ecf020e
-R 1969cb0ebb207c1f7d211b0f782f1262
-U dan
-Z aa90d8f8ef0b8ff7fa6722d460d8bb52
+P 14e53d0e2f62d82ae1d64a72fd9711548e3bf5ea
+R 91f64055039542194e221b2aa9a3eada
+T *branch * dev
+T *sym-dev *
+T -sym-trunk *
+U drh
+Z 6a1a8543c69edff1da4c7cb6389abc41
diff --git a/manifest.uuid b/manifest.uuid
index 1a42275..6ae6f05 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14e53d0e2f62d82ae1d64a72fd9711548e3bf5ea
\ No newline at end of file
+da94a6e0ebacad8f235dcd653a25474327f26137
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f9635a4..69f1f54 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2540,7 +2540,7 @@
#define WHERE_DISTINCTBY 0x0200 /* pOrderby is really a DISTINCT clause */
#define WHERE_WANT_DISTINCT 0x0400 /* All output needs to be distinct */
#define WHERE_SORTBYGROUP 0x0800 /* Support sqlite3WhereIsSorted() */
-#define WHERE_REOPEN_IDX 0x1000 /* Try to use OP_ReopenIdx */
+ /* 0x1000 not currently used */
#define WHERE_ONEPASS_MULTIROW 0x2000 /* ONEPASS is ok with multiple rows */
#define WHERE_USE_LIMIT 0x4000 /* There is a constant LIMIT clause */
#define WHERE_SEEK_TABLE 0x8000 /* Do not defer seeks on main table */
diff --git a/src/where.c b/src/where.c
index 0c3f05f..849d0ae 100644
--- a/src/where.c
+++ b/src/where.c
@@ -4479,7 +4479,7 @@
pWInfo->aiCurOnePass[1] = iIndexCur;
}else if( iAuxArg && (wctrlFlags & WHERE_ONETABLE_ONLY)!=0 ){
iIndexCur = iAuxArg;
- if( wctrlFlags & WHERE_REOPEN_IDX ) op = OP_ReopenIdx;
+ op = OP_ReopenIdx;
}else{
iIndexCur = pParse->nTab++;
}
diff --git a/src/wherecode.c b/src/wherecode.c
index aee50c3..a42fa1f 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1629,7 +1629,6 @@
){
assert( pSubWInfo->a[0].iIdxCur==iCovCur );
pCov = pSubLoop->u.btree.pIndex;
- wctrlFlags |= WHERE_REOPEN_IDX;
}else{
pCov = 0;
}
