From: mistachkin <mistachkin@noemail.net>
Date: Tue, 21 Jan 2014 01:13:45 +0000 (+0000)
Subject: Fix a couple comment typos and one overly long line.  No functional changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532359e4e0058f945c0c1a87cd6fa573dc57f6b3;p=thirdparty%2Fsqlite.git

Fix a couple comment typos and one overly long line.  No functional changes.

FossilOrigin-Name: c57deced09c67085852eb17d4f6f881416daf24c
---

diff --git a/manifest b/manifest
index afe5fdea0f..75fd454ed7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\sLEVEL\spseudo-column\sin\sthe\srecursive\spart\sof\na\scommon\stable\sexpression.\s\sLEVEL\shas\sthe\svalue\sof\s1\son\sthe\sfirst\siteration\nand\ssuccessively\slarger\sinteger\svalues\sof\ssubsequent\siterations.\s\sIt\scannot\nhave\sa\stable\squalifier.\s\sActual\scolumns\snamed\s"level"\scan\sstill\sbe\saccessed\nby\sincluding\sthe\stable\sname\squalifier.
-D 2014-01-21T00:19:43.076
+C Fix\sa\scouple\scomment\stypos\sand\sone\soverly\slong\sline.\s\sNo\sfunctional\schanges.
+D 2014-01-21T01:13:45.746
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,14 +217,14 @@ F src/pragma.c ed409ce4104cf4d9de6ead40ace70974f124853b
 F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
 F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
-F src/resolve.c f35795a7d6fdb2f500ccbe9229e14a4b69e1e140
+F src/resolve.c 3e22bf604677036d4aed6ddb91705c37938be4c5
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c a2709e1b91731d65bc0839974ff95cdc58cd81bd
 F src/shell.c 9f3bc02a658b8f61d2cbe60cfc482f660c1c6c48
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h d5a534b30be3f0002a1cde919113f399d8b81a79
+F src/sqliteInt.h bd0ae72872841059d55f928c330c2c53efff509f
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -1153,7 +1153,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 7d9e22187daaa3160b875a1df17b924969bf718e
-R 868eac95940900577c41ddbd3ee20aa3
-U drh
-Z 41ceab9a1912e9f5aae2b29b90c57305
+P cc1cb3217800ff666a00bf4f544a5a477589bc1b
+R d7b88acbea11aa8a9631e3e1df1ea620
+U mistachkin
+Z 3b56f57b80b503ffdcf535e8f4844624
diff --git a/manifest.uuid b/manifest.uuid
index 49ef00d45e..bd8ff957d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cc1cb3217800ff666a00bf4f544a5a477589bc1b
\ No newline at end of file
+c57deced09c67085852eb17d4f6f881416daf24c
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 9418386629..fcf50da526 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -268,11 +268,15 @@ static int lookupName(
     SrcList *pSrcList = pNC->pSrcList;
 
 #ifndef SQLITE_OMIT_CTE
-    /* The identifier "LEVEL", with a table or database qualifier and within a
-    ** recursive common table expression, resolves to the special LEVEL pseudo-column.
-    ** To access table names called "level", add a table qualifier.
+    /* The identifier "LEVEL", without a table or database qualifier and
+    ** within a recursive common table expression, resolves to the special
+    ** LEVEL pseudo-column.  To access table names called "level", add a
+    ** table qualifier.
     */
-    if( (pNC->ncFlags&NC_Recursive)!=0 && zTab==0 && sqlite3_stricmp(zCol,"level")==0 ){
+    if( (pNC->ncFlags&NC_Recursive)!=0
+     && zTab==0
+     && sqlite3_stricmp(zCol,"level")==0
+    ){
       assert( cnt==0 );
       cnt = 1;
       newOp = TK_LEVEL;
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index cbb12294a8..edcdcd09a8 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2107,7 +2107,7 @@ struct NameContext {
 #define NC_IsCheck   0x04    /* True if resolving names in a CHECK constraint */
 #define NC_InAggFunc 0x08    /* True if analyzing arguments to an agg func */
 #define NC_PartIdx   0x10    /* True if resolving a partial index WHERE */
-#define NC_Recursive 0x20    /* Resolvingn a recursive CTE definition */
+#define NC_Recursive 0x20    /* Resolving a recursive CTE definition */
 #define NC_UsesLevel 0x40    /* The LEVEL pseudo-column has been seen */
 
 /*