From: drh <drh@noemail.net>
Date: Fri, 30 Aug 2013 17:50:35 +0000 (+0000)
Subject: Fix comment typos in the where.c module.  No code changes.
X-Git-Tag: version-3.8.1~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e56dd3ad7b8d9df78597ad610e6fa57bffc3c9a2;p=thirdparty%2Fsqlite.git

Fix comment typos in the where.c module.  No code changes.

FossilOrigin-Name: 1e0b77cf0edf3d26f76d83aa5466e9ec0e60a710
---

diff --git a/manifest b/manifest
index 40b0c08cea..088690155d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthe\scost\sof\stwo\swhereLoop\sobjects\sis\sthe\ssame\sin\severy\sway\sexcept\sthat\none\shas\sfewer\sexpected\soutput\srows\sthan\sthe\sother,\sthen\schoose\sthe\sone\swith\nfewer\soutput\srows.
-D 2013-08-30T17:35:44.308
+C Fix\scomment\stypos\sin\sthe\swhere.c\smodule.\s\sNo\scode\schanges.
+D 2013-08-30T17:50:35.740
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 97fc542b38b3816c9b52cc2b2f0463e1de764d94
+F src/where.c 83f6106e0edfa23d1258c617cd58e3125277a363
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P ba5190534330a25722eeb7ea9c42da7a6d146014
-R 1b70f1acf0bcfec841a600fcdc82af8f
+P 79e458ef7acfddbc189163e3e958da529becb130
+R 11e0df2697ccef8d248e0028842ddb62
 U drh
-Z 482da10fef5b3db6e155cce4ef946cbe
+Z 34db069768d39fa7815ab1043f1fae87
diff --git a/manifest.uuid b/manifest.uuid
index 5128d39ea5..f13affc075 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79e458ef7acfddbc189163e3e958da529becb130
\ No newline at end of file
+1e0b77cf0edf3d26f76d83aa5466e9ec0e60a710
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index fc67b0ec06..235277d63d 100644
--- a/src/where.c
+++ b/src/where.c
@@ -185,9 +185,9 @@ static int whereLoopResize(sqlite3*, WhereLoop*, int);
 ** that implement some or all of a query plan.
 **
 ** Think of each WhereLoop object as a node in a graph with arcs
-** showing dependences and costs for travelling between nodes.  (That is
+** showing dependencies and costs for travelling between nodes.  (That is
 ** not a completely accurate description because WhereLoop costs are a
-** vector, not a scalar, and because dependences are many-to-one, not
+** vector, not a scalar, and because dependencies are many-to-one, not
 ** one-to-one as are graph nodes.  But it is a useful visualization aid.)
 ** Then a WherePath object is a path through the graph that visits some
 ** or all of the WhereLoop objects once.
@@ -4172,7 +4172,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
      && p->nOut<=pTemplate->nOut
     ){
       /* This branch taken when p is equal or better than pTemplate in 
-      ** all of (1) dependences (2) setup-cost, (3) run-cost, and
+      ** all of (1) dependencies (2) setup-cost, (3) run-cost, and
       ** (4) number of output rows. */
       assert( p->rSetup==pTemplate->rSetup );
       if( p->nLTerm<pTemplate->nLTerm
@@ -4197,7 +4197,7 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
      && ALWAYS(p->rSetup>=pTemplate->rSetup) /* See SETUP-INVARIANT above */
     ){
       /* Overwrite an existing WhereLoop with a better one: one that is
-      ** better at one of (1) dependences, (2) setup-cost, (3) run-cost
+      ** better at one of (1) dependencies, (2) setup-cost, (3) run-cost
       ** or (4) number of output rows, and is no worse in any of those
       ** categories. */
       pNext = p->pNextLoop;