Merge trunk enhancements into index-expr-opt branch.

FossilOrigin-Name: 56ef97e64efb84176df570819474901d492209ff80ce4355ff896dea9d2b8a51

diff --cc manifest
index af4a5b033e750a37ca157ae51d8e4250e61187a7,f650226ca1de26adaab8cf17ed310d3d10b56c05..e2d3074db5e953387362e781cf9c2b80e27e4ec8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Enable\sthe\sindex-on-expression\soptimization\seven\swhen\sthe\sexpression\sis\nused\sas\san\sargument\sto\san\saggregate\sfunction.
- D 2022-10-15T12:01:40.334
 -C Make\suse\sof\salloca()\sin\swherePathSolver()\swhen\sSQLITE_USE_ALLOCA\sis\sdefined.
 -D 2022-10-17T10:15:41.927
++C Merge\strunk\senhancements\sinto\sindex-expr-opt\sbranch.
++D 2022-10-17T14:29:04.031
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -622,7 -624,7 +624,7 @@@ F src/shell.c.in 2915eaf22bda89ad653385
  F src/sqlite.h.in d9c8a6243fc0a1c270d69db33758e34b810af3462f9bc5b4af113b347e07c69d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 5336beea1868d99d2f62e628dbea55e97267dbff8193291ab175e960c5df9141
- F src/sqliteInt.h 30e6fdc957f09dbdbe1bcf73874263427bbd9a321cd2a583de74bdb030c9fa78
 -F src/sqliteInt.h 27916b91f3aafd09d1b50f62948e0d506a58933f4cf5f5c136233658fbd39e60
++F src/sqliteInt.h 2a182a906ac614eb240a68abba8eaf4b018693fd2410ddaa133c08de00507e0a
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -704,10 -706,10 +706,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 8517a0ee4a3169368176fda649e2693ee013d7bdca72d485050e91cd640735f7
 -F src/where.c ab74681d07e310fb81c01c2bb1068378764cfff9e431e2b01aacc7a3678a018d
++F src/where.c a1c42bab8e840fa2cc90f6caf0f7133c35972e2f93b5899a90036d85e665c107
  F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
- F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
+ F src/wherecode.c 8ec5a413f12af06638dcca36d0954be2151eea6f293d3c67397cef6a90d6adf1
 -F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 +F src/whereexpr.c bf8c155212c886621d71c951053660de6fcc4ee907b17aa02da0a96a39aa9405
  F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -2031,8 -2033,8 +2033,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 08b033c737d1a84859291f50e2985c9dad8d660a50185d55d3171165a8e08d4c
- R a01b27e71bf0d1c060a37cd77d73f0f5
 -P 2ab3cf4d71b23a4c0b69f977828d82df7bbc080c29ae189e0d78d38efee50c96
 -R fd1636fa451b5b8e84570a9195b2236a
++P 462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58 45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
++R 6f3970b0a66900429c4532002ac9cf64
  U drh
- Z 807c2ee5a3bf759378437d2cb1bbfe03
 -Z 2743069ef130a7abdc131b5ac7f77275
++Z f2ec0a1b95a0b19c496d987488a36bd5
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index ce95dd861c8918410fdf0c26f401062596d69f42,d362e0dc32f3425c85517f4ef75c2aa15ce7cf83..ff66fa27b155d79f9d692625be0d86799c86bd0c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 462b3c7f39724dc814f55e7a225e7d0c48f81c524cdda797a66e9e198c35ce58
 -45752471521f8d4a6cad4bce40f907018acd403ffd3b8170020c34e4e0b6b91b
++56ef97e64efb84176df570819474901d492209ff80ce4355ff896dea9d2b8a51

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge