When Select-Trace is enabled (in debugging builds only) do not show the

result of Window function tree rewrites if there are no window functions.

FossilOrigin-Name: d1acf72ae1ea7484bb9c3a8630094f1a3a9597578c7b9d6e02fc0a4e3f59c57d

diff --git a/manifest b/manifest
index 456c9fea652f98b09e49057c344c1ce67360c090..bbdc0f15c46acf582939f96f17901b9c05da82bc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\szipfile\sextension\sto\suse\sdeflateBound(),\sinstead\sof\scompressBound(),\sto\slearn\sthe\smaximum\spossible\ssize\sof\sa\sdeflate()d\sbuffer.
-D 2019-10-11T18:55:10.084
+C When\sSelect-Trace\sis\senabled\s(in\sdebugging\sbuilds\sonly)\sdo\snot\sshow\sthe\nresult\sof\sWindow\sfunction\stree\srewrites\sif\sthere\sare\sno\swindow\sfunctions.
+D 2019-10-12T23:38:00.145
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -525,7 +525,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c e021be0c1c4a2125fa38aabcd8dbb764bf5b2c889a948c30d3708430ec6ccd00
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c b3d64a7a3342471ce078251c5ba132f8ec66f994534f1070dda025b354a09a62
+F src/select.c 7ef05eeb7f686f84dd1428cbdca280c898915bbf56e1ea97bd42ecc070af78d3
 F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1846,7 +1846,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8a39167bd2d46496f7484cfec371e4bad22da882209b01da9459c4ed5877da25
-R eb06663b6457025b40a5a6ff154e9856
-U dan
-Z efc0771126277e0cc41b7707a438e0f8
+P f5ee30426e8876e70304f852153b56991a2a66e0f6a82597e9dcccf49163272d
+R efdbb8351c1ff37fb18793c0f98348de
+U drh
+Z aeb1a204a5f6f383373587bc05ae8c43

diff --git a/manifest.uuid b/manifest.uuid
index 38561b7f5d49154a96d33dafaa1e58efeae16b0f..b8e545826a8df01a48a68619fe7e1f621369e856 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5ee30426e8876e70304f852153b56991a2a66e0f6a82597e9dcccf49163272d
\ No newline at end of file
+d1acf72ae1ea7484bb9c3a8630094f1a3a9597578c7b9d6e02fc0a4e3f59c57d
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7cc5cde0ec2c4e17611d3f08802f27899a14ab6e..a5377a2c2094f49b4a2312f01c93f62e1c02f382 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5727,7 +5727,7 @@ int sqlite3Select(
     goto select_end;
   }
 #if SELECTTRACE_ENABLED
-  if( sqlite3SelectTrace & 0x108 ){
+  if( p->pWin && (sqlite3SelectTrace & 0x108)!=0 ){
     SELECTTRACE(0x104,pParse,p, ("after window rewrite:\n"));
     sqlite3TreeViewSelect(0, p, 0);
   }