From: drh <drh@noemail.net>
Date: Tue, 19 Nov 2013 12:33:23 +0000 (+0000)
Subject: Change Noop-comments in where.c into Module-comments, so that they are
X-Git-Tag: version-3.8.2~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bc69a2d4b0b23dee133db83992c106210b25c32;p=thirdparty%2Fsqlite.git

Change Noop-comments in where.c into Module-comments, so that they are
omitting without SQLITE_ENABLE_MODULE_COMMENTS.

FossilOrigin-Name: 3e577f40183c56e60866d8382b044688a1b77eaf
---

diff --git a/manifest b/manifest
index dee084c753..f97a14f179 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sseeking\son\sthe\smain\sdata\stable\sduring\sthe\sfirst\sloop\sof\san\sUPDATE\nif\san\sindex\sis\ssufficient\sto\scheck\sthe\sWHERE\sclause.
-D 2013-11-19T02:34:11.947
+C Change\sNoop-comments\sin\swhere.c\sinto\sModule-comments,\sso\sthat\sthey\sare\nomitting\swithout\sSQLITE_ENABLE_MODULE_COMMENTS.
+D 2013-11-19T12:33:23.661
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8a07bebafbfda0eb67728f4bd15a36201662d1a1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -293,7 +293,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74
-F src/where.c c0a9bab3e783ecab6add9d08430dd5414810f2fe
+F src/where.c aa72ba871fa835a513cae1c7432dc1d785eb23e4
 F src/whereInt.h 96a75c61f1d2b9d4a8e4bb17d89deb0cf7cba358
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1140,7 +1140,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 072412d5e3f92c9c6548f5c86d396d3f024df3f7
-R ef3f52da3f64e056bcf519f817dc69c2
+P 57158d9daf4d777411fffb1c1d20d89b291d9214
+R 4e071f5e12e1562d0bddca81679884f9
 U drh
-Z b9dbca4948b9d68d76792a11f3b2fa7e
+Z a3df5d2252057bf6401f296b034ac821
diff --git a/manifest.uuid b/manifest.uuid
index 1cdbc74de7..fe9187568e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-57158d9daf4d777411fffb1c1d20d89b291d9214
\ No newline at end of file
+3e577f40183c56e60866d8382b044688a1b77eaf
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index a163895bb7..3d36625c45 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2756,7 +2756,7 @@ static Bitmask codeOneLoopStart(
   bRev = (pWInfo->revMask>>iLevel)&1;
   omitTable = (pLoop->wsFlags & WHERE_IDX_ONLY)!=0 
            && (pWInfo->wctrlFlags & WHERE_FORCE_TABLE)==0;
-  VdbeNoopComment((v, "Begin WHERE-loop%d: %s",iLevel,pTabItem->pTab->zName));
+  VdbeModuleComment((v, "Begin WHERE-loop%d: %s",iLevel,pTabItem->pTab->zName));
 
   /* Create labels for the "break" and "continue" instructions
   ** for the current loop.  Jump to addrBrk to break out of a loop.
@@ -3461,7 +3461,7 @@ static Bitmask codeOneLoopStart(
     if( pAlt->wtFlags & (TERM_CODED) ) continue;
     testcase( pAlt->eOperator & WO_EQ );
     testcase( pAlt->eOperator & WO_IN );
-    VdbeNoopComment((v, "begin transitive constraint"));
+    VdbeModuleComment((v, "begin transitive constraint"));
     pEAlt = sqlite3StackAllocRaw(db, sizeof(*pEAlt));
     if( pEAlt ){
       *pEAlt = *pAlt->pExpr;
@@ -5736,7 +5736,7 @@ WhereInfo *sqlite3WhereBegin(
   }
 
   /* Done. */
-  VdbeNoopComment((v, "Begin WHERE-core"));
+  VdbeModuleComment((v, "Begin WHERE-core"));
   return pWInfo;
 
   /* Jump here if malloc fails */
@@ -5763,7 +5763,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
 
   /* Generate loop termination code.
   */
-  VdbeNoopComment((v, "End WHERE-core"));
+  VdbeModuleComment((v, "End WHERE-core"));
   sqlite3ExprCacheClear(pParse);
   for(i=pWInfo->nLevel-1; i>=0; i--){
     int addr;
@@ -5809,7 +5809,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       }
       sqlite3VdbeJumpHere(v, addr);
     }
-    VdbeNoopComment((v, "End WHERE-loop%d: %s", i,
+    VdbeModuleComment((v, "End WHERE-loop%d: %s", i,
                      pWInfo->pTabList->a[pLevel->iFrom].pTab->zName));
   }