Improved handling of aggregate subqueries within an aggregate query.

FossilOrigin-Name: 430bb59d798286a86c351de92c429345f016b3f0
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index ccffe09..cb178ff 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2011,7 +2011,6 @@
   u8 allowAgg;         /* Aggregate functions allowed here */
   u8 hasAgg;           /* True if aggregates are seen */
   u8 isCheck;          /* True if resolving names in a CHECK constraint */
-  int nDepth;          /* Depth of subquery recursion. 1 for no recursion */
   AggInfo *pAggInfo;   /* Information about aggregates at this level */
   NameContext *pNext;  /* Next outer name context.  NULL for outermost */
 };
@@ -2477,6 +2476,7 @@
   union {                                   /* Extra data for callback */
     NameContext *pNC;                          /* Naming context */
     int i;                                     /* Integer value */
+    SrcList *pSrcList;                         /* FROM clause */
   } u;
 };