Enhance the selecttrace display by showing Select.selFlags.

FossilOrigin-Name: 45d3893c6142ee1dfed48e26a13cf547da12468a

diff --git a/manifest b/manifest
index b7c9b4f43e7856d1bcee133bf25d8bcb3a07d7bb..33442b203571bd316ea5e9c76fe6b39dc0d9c25a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sMSVC\smakefile\sso\sthat\sit\sworks\swith\sOTA.\s\sFix\sa\sharmless\scompiler\nwarning\sin\sFTS3.
-D 2015-05-19T22:56:45.390
+C Enhance\sthe\sselecttrace\sdisplay\sby\sshowing\sSelect.selFlags.
+D 2015-05-19T23:56:07.009
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 6d9d6ae899acb9bf148862e8cccdf16085514b26
+F src/select.c 95e728e1bdbca2ee45016308e3eb6d19095155cc
 F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
 F src/sqlite.h.in 0127e418883c2b41f7fbc056bc1033fa56fbd2a5
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1278,7 +1278,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 b271ed56532a78323accc8a7cb348d55f95c350e
-R 90be3dacb0448d45e67c9b3d977b8761
+P c7b16645307d6e46c4153693d6806269de64955f
+R ea3eb1f6139bdf0dd5e3dd418a160ce1
 U drh
-Z 153c06778c9f21378fccc520e3f4d229
+Z 134fe99ba84c8d22f546034f7884244d

diff --git a/manifest.uuid b/manifest.uuid
index 35751a8d8867f3a6c754a36b05ae086b7311ca96..605cc6bbcbc854240dde209b3eb280d31bf50d5c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7b16645307d6e46c4153693d6806269de64955f
\ No newline at end of file
+45d3893c6142ee1dfed48e26a13cf547da12468a
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index e8d9fdd5ca1a91ac6d80101859fa9a3dd11fbe14..fff0cd9a28a47d0bbf82f9b2d33a4877b21f5c40 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5523,9 +5523,9 @@ select_end:
 void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){
   int n = 0;
   pView = sqlite3TreeViewPush(pView, moreToFollow);
-  sqlite3TreeViewLine(pView, "SELECT%s%s (0x%p)",
+  sqlite3TreeViewLine(pView, "SELECT%s%s (0x%p) selFlags=0x%x",
     ((p->selFlags & SF_Distinct) ? " DISTINCT" : ""),
-    ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""), p
+    ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""), p, p->selFlags
   );
   if( p->pSrc && p->pSrc->nSrc ) n++;
   if( p->pWhere ) n++;