From ca74fbf6f164ad6fa9c6bd79050dc57cdcd69388 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Sun, 24 May 2020 02:05:04 +0000
Subject: [PATCH] Improvements to parse-tree tracing logic.  No changes in
 deliverable code.

patch reference:
https://www.sqlite.org/src/info/f7e5a68a7ebbb97a

FossilOrigin-Name: f7e5a68a7ebbb97a5beb050a75b3b4cf2fd6adc54653da993a8950fb3a5799f7
---
 src/select.c   | 2 +-
 src/treeview.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/select.c b/src/select.c
index 0cc6b87..9a16e8e 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6379,7 +6379,7 @@ int sqlite3Select(
 #if SELECTTRACE_ENABLED
     if( sqlite3SelectTrace & 0x400 ){
       int ii;
-      SELECTTRACE(0x400,pParse,p,("After aggregate analysis:\n"));
+      SELECTTRACE(0x400,pParse,p,("After aggregate analysis %p:\n", &sAggInfo));
       sqlite3TreeViewSelect(0, p, 0);
       for(ii=0; ii<sAggInfo.nColumn; ii++){
         sqlite3DebugPrintf("agg-column[%d] iMem=%d\n",
diff --git a/src/treeview.c b/src/treeview.c
index 90a1d2d..f0751d1 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -578,8 +578,9 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
 #endif 
       }
       if( pExpr->op==TK_AGG_FUNCTION ){
-        sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s",
-                             pExpr->op2, pExpr->u.zToken, zFlgs);
+      sqlite3TreeViewLine(pView, "AGG_FUNCTION%d %Q%s iAgg=%d agg=%p",
+		      pExpr->op2, pExpr->u.zToken, zFlgs,
+		      pExpr->iAgg, pExpr->pAggInfo);
       }else if( pExpr->op2!=0 ){
         const char *zOp2;
         char zBuf[8];
-- 
2.23.0