Index: src/expr.c
==================================================================
--- src/expr.c
+++ src/expr.c
@@ -1067,10 +1067,13 @@
   pNew->selFlags = p->selFlags & ~SF_UsesEphemeral;
   pNew->addrOpenEphm[0] = -1;
   pNew->addrOpenEphm[1] = -1;
   pNew->nSelectRow = p->nSelectRow;
   pNew->pWith = withDup(db, p->pWith);
+#if SELECTTRACE_ENABLED
+  memcpy(pNew->zSelLabel, p->zSelLabel, sizeof(p->zSelLabel));
+#endif
   return pNew;
 }
 #else
 Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
   assert( p==0 );

Index: src/select.c
==================================================================
--- src/select.c
+++ src/select.c
@@ -4610,10 +4610,11 @@
   if( p==0 || db->mallocFailed || pParse->nErr ){
     return 1;
   }
   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
   memset(&sAggInfo, 0, sizeof(sAggInfo));
+  SELECTTRACE(1, ("begin processing %s\n", p->zSelLabel));
 
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistFifo );
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_Fifo );
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistQueue );
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_Queue );
@@ -5365,10 +5366,11 @@
     generateColumnNames(pParse, pTabList, pEList);
   }
 
   sqlite3DbFree(db, sAggInfo.aCol);
   sqlite3DbFree(db, sAggInfo.aFunc);
+  SELECTTRACE(1, ("end processing %s\n", p->zSelLabel));
   return rc;
 }
 
 #if defined(SQLITE_ENABLE_TREE_EXPLAIN)
 /*

Index: src/sqliteInt.h
==================================================================
--- src/sqliteInt.h
+++ src/sqliteInt.h
@@ -708,12 +708,11 @@
 
 /*
 ** SELECTTRACE_ENABLED will be either 1 or 0 depending on whether or not
 ** the Select query generator tracing logic is turned on.
 */
-#if defined(SQLITE_DEBUG) \
-    && (defined(SQLITE_TEST) || defined(SQLITE_ENABLE_SELECTTRACE))
+#if defined(SQLITE_DEBUG) || defined(SQLITE_ENABLE_SELECTTRACE)
 # define SELECTTRACE_ENABLED 1
 #else
 # define SELECTTRACE_ENABLED 0
 #endif