From: drh <drh@noemail.net>
Date: Tue, 14 Jul 2020 15:30:35 +0000 (+0000)
Subject: Fix an obsolete header comment on the sqlite3WhereIsOrdered() routine.
X-Git-Tag: version-3.33.0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37b7680a411d117852d0878fe5dde42b208d6b9;p=thirdparty%2Fsqlite.git

Fix an obsolete header comment on the sqlite3WhereIsOrdered() routine.

FossilOrigin-Name: 5041f6a1c439b43c654e72a391517c115e222ef0e9a565907b03149b535e92c8
---

diff --git a/manifest b/manifest
index 128609c9ae..cbd136fee9 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Early\sdetection\sof\sfreelist\ssize\scorruption\sin\sincremental\svacuum.
-D 2020-07-14T12:40:53.857
+C Fix\san\sobsolete\sheader\scomment\son\sthe\ssqlite3WhereIsOrdered()\sroutine.
+D 2020-07-14T15:30:35.654
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -31,6 +31,7 @@ F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
 F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
 F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
+F src/where.c c6bc09762a43af7bcb72a5b64c06d58e286f32f54f0683c76ca1c6dd1275c8ac
 F src/window.c 0dec178bfa541c757d15a2be78f34aea36393a0966600366810e5f8739ccf370
 F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
 F test/busy2.test 415364312743992641f9bf679c84918327296067f85a5d00012b339dc35acbd7
@@ -51,7 +52,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
-R 6c75ad267939fa9d328d6d874eb3a742
+P f25a56c26e28abd44373230c6b5763aed35c9a7648abede8a53409dccc0bee1d
+R 7f32232737be4b699f9f8035e6c68fa2
 U drh
-Z 34c5068e51b7d65d7ed7e485c5f919a6
+Z 34db015e32022e5460ba09d5796be27a
diff --git a/manifest.uuid b/manifest.uuid
index ee6465087b..016dda6ce5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f25a56c26e28abd44373230c6b5763aed35c9a7648abede8a53409dccc0bee1d
\ No newline at end of file
+5041f6a1c439b43c654e72a391517c115e222ef0e9a565907b03149b535e92c8
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index a7df4b9b80..e3338a3a7b 100644
--- a/src/where.c
+++ b/src/where.c
@@ -59,8 +59,12 @@ int sqlite3WhereIsDistinct(WhereInfo *pWInfo){
 }
 
 /*
-** Return TRUE if the WHERE clause returns rows in ORDER BY order.
-** Return FALSE if the output needs to be sorted.
+** Return the number of ORDER BY terms that are satisfied by the
+** WHERE clause.  A return of 0 means that the output must be
+** completely sorted.  A return equal to the number of ORDER BY
+** terms means that no sorting is needed at all.  A return that
+** is positive but less than the number of ORDER BY terms means that
+** block sorting is required.
 */
 int sqlite3WhereIsOrdered(WhereInfo *pWInfo){
   return pWInfo->nOBSat;