Provide one final Select tree dump prior to WHERE clause analysis

when ".selecttrace 0x400" tracing bit is set with SELECTTRACE_ENABLED.
Analysis and debug changes only - normal builds are unaffected.

FossilOrigin-Name: 283bf0b64da7acc5aa5812fc659954965002d409

diff --git a/manifest b/manifest
index eb67a9af5b67a685dde31555e50739d861e44ad1..4d3f877745ed05beb9637c9d8b0667e72116150d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sSrcList.a[].zIndex\sto\sthe\smore\sdescriptive\nSrcList.a[0].zIndexedBy.
-D 2015-06-04T12:08:53.261
+C Provide\sone\sfinal\sSelect\stree\sdump\sprior\sto\sWHERE\sclause\sanalysis\s\nwhen\s".selecttrace\s0x400"\stracing\sbit\sis\sset\swith\sSELECTTRACE_ENABLED.\nAnalysis\sand\sdebug\schanges\sonly\s-\snormal\sbuilds\sare\sunaffected.
+D 2015-06-05T20:27:26.103
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 994bab32a3a69e0c35bd148b65cde49879772964
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 36416c13e4a156fa7e8f29181e28964612767ddf
+F src/select.c b2dfbc9ca9e4d04a34c1b4defdfda7867fee0eb8
 F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 F src/sqlite.h.in d165beeceb6b40af60f352a4d4e37e02d9af7df0
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1282,7 +1282,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9f035c45a4b84203e67b6e1b23cf11691dc43f1e
-R ad5ce5f5b8d17995393297d9ed2a0d0e
+P 6a9cf063379118dbb95c6cdc6d60af50e9867177
+R 7720d4f64678b0c7b4af503d2d9c054f
 U drh
-Z de80e81db21512cdc452bca7645bb7ca
+Z 95e994f89cb6168fd34736cd7cbf5b60

diff --git a/manifest.uuid b/manifest.uuid
index e2792cff66a5ba83250e12602ba66eea34ecea27..c711a8d149ddf0b2c5b77dc1af22047b4fb541f6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a9cf063379118dbb95c6cdc6d60af50e9867177
\ No newline at end of file
+283bf0b64da7acc5aa5812fc659954965002d409
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index d50ff7965e9e4261416316951704b949eba63842..a3e92655b1eccb979126551ed653f246c60daee0 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3709,7 +3709,7 @@ static int flattenSubquery(
 
 #if SELECTTRACE_ENABLED
   if( sqlite3SelectTrace & 0x100 ){
-    sqlite3DebugPrintf("After flattening:\n");
+    SELECTTRACE(0x100,pParse,p,("After flattening:\n"));
     sqlite3TreeViewSelect(0, p, 0);
   }
 #endif
@@ -4889,7 +4889,7 @@ int sqlite3Select(
       ){
 #if SELECTTRACE_ENABLED
         if( sqlite3SelectTrace & 0x100 ){
-          sqlite3DebugPrintf("After WHERE-clause push-down:\n");
+          SELECTTRACE(0x100,pParse,p,("After WHERE-clause push-down:\n"));
           sqlite3TreeViewSelect(0, p, 0);
         }
 #endif
@@ -4964,6 +4964,13 @@ int sqlite3Select(
   pHaving = p->pHaving;
   sDistinct.isTnct = (p->selFlags & SF_Distinct)!=0;
 
+#if SELECTTRACE_ENABLED
+  if( sqlite3SelectTrace & 0x400 ){
+    SELECTTRACE(0x400,pParse,p,("After all FROM-clause analysis:\n"));
+    sqlite3TreeViewSelect(0, p, 0);
+  }
+#endif
+
 #ifndef SQLITE_OMIT_COMPOUND_SELECT
   /* If there is are a sequence of queries, do the earlier ones first.
   */