Additional ".selecttrace" debugging output when the query is transformed from a

DISTINCT into a GROUP BY.

FossilOrigin-Name: 5a46914510af4d5557b299db65c68d5df1070766

diff --git a/manifest b/manifest
index 99045262534857f19e3232dd5521787bc77304d3..777999ecae4f4f2ecf50b544e972b5d8a8b1fd20 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompiler\swarnings\sby\sremoving\ssurplus\slocal\svariables\sin\sthe\sschema\npretty-printer\slogic\sof\sthe\scommand-line\sshell.
-D 2016-04-13T21:00:36.984
+C Additional\s".selecttrace"\sdebugging\soutput\swhen\sthe\squery\sis\stransformed\sfrom\sa\nDISTINCT\sinto\sa\sGROUP\sBY.
+D 2016-04-14T13:06:49.646
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -375,7 +375,7 @@ F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
 F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
-F src/select.c a07e6022e2b559f3c2ec80442472c5965fa7a3fc
+F src/select.c 6c7f3cf68af334ed1ec40c20b5cff9b1e632d824
 F src/shell.c ebcdf99f3e7c7409bd463eae443f1bd01e3e2d02
 F src/sqlite.h.in 64eb70a3b309751bebf73a5552a51244f68f0ea5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1482,7 +1482,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 68142dc541b7a0a36fcb075a26f10f03c1e7c422
-R df66fcce8d8333da43cbdaefe267859a
+P 55a62483b9121a8b373d038a26fdebc4308661f6
+R 7bb58a4f89e336cb6f9f8cccdaf5c333
 U drh
-Z 3bcaedd99c30eef242301f45d5550540
+Z 71b74109092a6d83b57a993cec7348f7

diff --git a/manifest.uuid b/manifest.uuid
index c1466783ea81112094bf64b69113e2d23239cf65..d8e9822a3a1d700cfb9cd632a18b3e0ba815b5e8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55a62483b9121a8b373d038a26fdebc4308661f6
\ No newline at end of file
+5a46914510af4d5557b299db65c68d5df1070766
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index fc37db5747558c66acf32ba056d13dbe5a734f22..e8de015cfea6fa64305cc3cb432a8525f135e650 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5092,6 +5092,13 @@ int sqlite3Select(
     ** the sDistinct.isTnct is still set.  Hence, isTnct represents the
     ** original setting of the SF_Distinct flag, not the current setting */
     assert( sDistinct.isTnct );
+
+#if SELECTTRACE_ENABLED
+    if( sqlite3SelectTrace & 0x400 ){
+      SELECTTRACE(0x400,pParse,p,("Transform DISTINCT into GROUP BY:\n"));
+      sqlite3TreeViewSelect(0, p, 0);
+    }
+#endif
   }
 
   /* If there is an ORDER BY clause, then create an ephemeral index to