Merge trunk fixes and enhancements into the agg-with-indexed-expr branch.

FossilOrigin-Name: 070634781a5eb41f96b001e48b064e3cd8c82314f576335eb1fcd43792179291

diff --cc manifest
index 8e8fab603a3c8c56b23980300ec0e3d81adc617c,19b1249875e1295e0ae6ec3803d3186e6c1eab82..8586f2587b9eeed54a49609465d5f5f3441c7b1b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Since\sthe\smemory\sregisters\sused\sby\sthe\scolumns\sand\sfunctions\sof\san\nAggInfo\sobject\sare\ssequential,\sit\sis\snot\sneecessary\sto\sremember\seach\sregister\nseparately.\s\sWe\scan\ssimply\sremember\sthe\sfirst\sone\sand\sdo\sthe\smath\swhen\nothers\sare\sneeded.
- D 2022-11-22T15:43:16.425
 -C Rename\sthe\sSELECTTRACE\smacro\sto\sTREETRACE,\sso\sthat\sis\scorresponds\sto\sthe\snew\nCLI\scommand.\s\sRenumber\sall\sof\sthe\sbits\sin\sthe\sbitmask\sused\sto\senable\nvarious\skinds\sof\stracing,\sand\sadd\sa\strace\sbitmap\sdecoder\sin\ssqliteInt.h.\nChanges\sto\sdebugging\slogic\sonly.\s\sNo\s(intentional)\schanges\sto\sproduction\scode.
 -D 2022-11-22T19:49:16.908
++C Merge\strunk\sfixes\sand\senhancements\sinto\sthe\sagg-with-indexed-expr\sbranch.
++D 2022-11-22T19:51:16.237
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -641,12 -641,12 +641,12 @@@ F src/printf.c e99ee9741e79ae3873458146
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
  F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c cf17743a695b3f4ff2dbd06d2ca8152997d37e3b3fd951efe0a67966740bd2d7
- F src/shell.c.in 16740a86346ba9823f92528ec588f2b74f68166dac965dabd19883ace230f11d
 -F src/select.c 4c48373abb4e67129c36bc15d1f5a99a0dfd9534afeb539a2169a09ae91ccec9
++F src/select.c 35c2b1b4d82190f202887620f99070c0d414c3e030e466032797792cffdbd9f9
+ F src/shell.c.in 7d1705f139e6762e8c0fe254a8ebf3ab77aec6d8366f033cdd5f5ebadefbbb20
  F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
- F src/sqliteInt.h fd605195929a3ce7f20da20b6a4da32045f9d4b343b51d94a0c7fdbad6207f24
 -F src/sqliteInt.h 3bdf90cb7578dfccfd3e8c0f9c8b0eecc5280f5813891d6b3016cd6f1bdb1f7e
++F src/sqliteInt.h 35db0abe8e960dd0396bedcb4489faeabccfbb2d1172568eab029fd72fba40ed
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2059,8 -2059,8 +2059,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d79c58ef08b917bacc0f24d210d8eb23f659f955c219b4757af42eee8f17099b
- R a8a65a86f26eb6db314813261a6e0287
 -P 861af465fda8485dfff143dc45c659b884d826aaec2ebaa941566404d1fe427b
 -R 513d506718a1d19eb8b1625991fbf39f
++P dc5bd34963b761c819c565653156d0befbf65cc2cc5dc4113b0ce952450f0352 8036445a36d9d982c1305935e7e37367bdf9e466b923eb6286b52524802e3ccd
++R e6ec32714f5519d3f42f7a87b92d7eba
  U drh
- Z 3374f8495add90924d12780ade06b13a
 -Z 151ecb78555215509ebdea4705787b10
++Z 31a3ccb601c45d898a857131ff2f396b
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index b43b5e65eba4de0a282e91341ea684b724e783ea,89e90a49a0aadfc8e7a3eb576fa60622b882b019..1556ed2eb3c735bb131c0f4ea8cbcd68ba86e824
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dc5bd34963b761c819c565653156d0befbf65cc2cc5dc4113b0ce952450f0352
 -8036445a36d9d982c1305935e7e37367bdf9e466b923eb6286b52524802e3ccd
++070634781a5eb41f96b001e48b064e3cd8c82314f576335eb1fcd43792179291

diff --cc src/select.c
index e40de38a59f41676d747a2d901db53fa2516a8fe,4d5bde9a31a15e4ac3e8daf68fb743a7f016a571..946649ad0b20d0b4daab3de5da51c952a5914ef3
--- 1/src/select.c
--- 2/src/select.c
+++ b/src/select.c
@@@ -7448,10 -7448,11 +7448,10 @@@ int sqlite3Select
  #endif
        sNC.ncFlags &= ~NC_InAggFunc;
      }
 -    pAggInfo->mxReg = pParse->nMem;
      if( db->mallocFailed ) goto select_end;
  #if TREETRACE_ENABLED
-     if( sqlite3TreeTrace & 0x400 ){
-       SELECTTRACE(0x400,pParse,p,("After aggregate analysis %p:\n", pAggInfo));
+     if( sqlite3TreeTrace & 0x20 ){
+       TREETRACE(0x20,pParse,p,("After aggregate analysis %p:\n", pAggInfo));
        sqlite3TreeViewSelect(0, p, 0);
        if( minMaxFlag ){
          sqlite3DebugPrintf("MIN/MAX Optimization (0x%02x) adds:\n", minMaxFlag);
@@@ -7535,9 -7536,8 +7535,9 @@@
          sqlite3ExprListDelete(db, pDistinct);
          goto select_end;
        }
 +      assignAggregateRegisters(pParse, pAggInfo);
        eDist = sqlite3WhereIsDistinct(pWInfo);
-       SELECTTRACE(1,pParse,p,("WhereBegin returns\n"));
+       TREETRACE(0x2,pParse,p,("WhereBegin returns\n"));
        if( sqlite3WhereIsOrdered(pWInfo)==pGroupBy->nExpr ){
          /* The optimizer is able to deliver rows in group by order so
          ** we do not have to sort.  The OP_OpenEphemeral table will be

diff --cc src/sqliteInt.h
Simple merge