From: drh <drh@noemail.net>
Date: Thu, 19 May 2016 19:31:30 +0000 (+0000)
Subject: Fixup comments on wctrlFlags value definitions.
X-Git-Tag: version-3.14.0~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc5eac00c2a093597cbb743891d8fbbb6312a50e;p=thirdparty%2Fsqlite.git

Fixup comments on wctrlFlags value definitions.

FossilOrigin-Name: 58b516e8c0b00a41bc0364eab267bc2ecb9efeff
---

diff --git a/manifest b/manifest
index 9444553652..89053f9deb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clean\sup\sthe\sWHERE_*\smacros\sused\sfor\sthe\swctrlFlags\sparameter\son\sthe\s\nsqlite3WhereBegin()\sinterface,\sfreeing\sup\ssome\sbits\sto\sbe\sused\sfor\sother\sthings.
-D 2016-05-19T18:56:33.988
+C Fixup\scomments\son\swctrlFlags\svalue\sdefinitions.
+D 2016-05-19T19:31:30.127
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -383,7 +383,7 @@ F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
 F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
-F src/sqliteInt.h 36ad4f5a86e1bef5e34c301b60bb24837f87d662
+F src/sqliteInt.h 19de316bfce65ff074b379a67b493a446f3cf8ee
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@ -1489,7 +1489,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 cf2737415aff7de7e133da174b645324c99d5758
-R b3dd248e38fe4d745483b43457d811f8
+P d01305841da94b2d47e32744802f69525bf590df
+R be830660ecf90ba00189952af638cb97
 U drh
-Z 077055ad654ddf765f85d8f018c402ea
+Z 54bddff0ee366139e2fb13081e6cf75a
diff --git a/manifest.uuid b/manifest.uuid
index 3688ab723e..177ef2d35a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d01305841da94b2d47e32744802f69525bf590df
\ No newline at end of file
+58b516e8c0b00a41bc0364eab267bc2ecb9efeff
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a232e7b894..c795036666 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2533,7 +2533,8 @@ struct SrcList {
 #define WHERE_ONEPASS_DESIRED  0x0004 /* Want to do one-pass UPDATE/DELETE */
 #define WHERE_ONEPASS_MULTIROW 0x0008 /* ONEPASS is ok with multiple rows */
 #define WHERE_DUPLICATES_OK    0x0010 /* Ok to return a row more than once */
-#define WHERE_OR_SUBCLAUSE     0x0020 /* Sub-WHERE for an OR term */
+#define WHERE_OR_SUBCLAUSE     0x0020 /* Processing a sub-WHERE as part of
+                                      ** the OR optimization  */
 #define WHERE_GROUPBY          0x0040 /* pOrderBy is really a GROUP BY */
 #define WHERE_DISTINCTBY       0x0080 /* pOrderby is really a DISTINCT clause */
 #define WHERE_WANT_DISTINCT    0x0100 /* All output needs to be distinct */
@@ -2542,7 +2543,7 @@ struct SrcList {
                         /*     0x0800    not currently used */
                         /*     0x1000    not currently used */
                         /*     0x2000    not currently used */
-#define WHERE_USE_LIMIT        0x4000 /* There is a constant LIMIT clause */
+#define WHERE_USE_LIMIT        0x4000 /* Use the LIMIT in cost estimates */
                         /*     0x8000    not currently used */
 
 /* Allowed return values from sqlite3WhereIsDistinct()