Merge trunk testing enhancements into the pushdown-subquery branch.

FossilOrigin-Name: 287ff24b26a512ff7648679767e68244f6eef95df6a49c46ed1f2594030ed523

diff --cc manifest
index 0be2ff7470a034984cf90c7ddbbd20261a22930f,c4e5160b20671877aa5e4c24143574fa349d95e4..9489e7d05e5bb3d8f63f0f5d073f5bbafe996602
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\senhancements\sinto\sthe\spushdown-subquery\sbranch.
- D 2024-04-07T10:30:29.186
 -C Omit\sall\srowid-in-view\srestrictions\sfrom\sthe\sfuzzinvariant.c\stest\smodule\nas\sthey\sare\sno\slonger\snecessary,\sas\sof\sthe\sprevious\scheck-in.
 -D 2024-04-07T18:36:32.081
++C Merge\strunk\stesting\senhancements\sinto\sthe\spushdown-subquery\sbranch.
++D 2024-04-07T18:55:57.788
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -748,9 -748,9 +748,9 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
  F src/printf.c 87b67bba3662a0523f39ae6b084a3907109702f717c654d6cecb838af5cd57f1
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
- F src/resolve.c f242e509b2ff9e31799d26ddd87f20db1124426203aa16833a694d401b50d650
 -F src/resolve.c 42d5d75a6ccfaf5b17d81fca64203ebce87f59702089142feed90df28dec1203
++F src/resolve.c 6310bdfed32184cd3a5d6ba203dfee1ea323051cb38a6c2e80a5b79c069f4e87
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -F src/select.c 3c8e1b921edfb71904b01c1ef9fb378224cdba71543342b164c7718cc8e82a44
 +F src/select.c 51893b3e34d38ad8d46b5010a6e380ca878b578be5001a640daa907336187424
  F src/shell.c.in 0354ca51eee5fbf6af394a7ef9f5ef6823ef45b743db65431f6777e4d5be2199
  F src/sqlite.h.in 32389e0d584551b300d0157881336162c14315a424cbf385c0d65eb7c2e31f7b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@@ -2184,8 -2184,8 +2184,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 8682931f9c6b40e1b09139c10bbe932c38330b5eb0c5c84f2432ad19a6793e37 3d5fb1ec7a0440072d6e3b957903c85d0f32b8b07207a1ef22d1a69cf5e664d1
- R 1c8ec3969a2f62f321843779b94d95c0
 -P 0a53dde21403aa6de11c5085c16def3f95046c5629daf2675b075e4d6683ef94
 -R 950039d72c57e0f5f8da3387d03515aa
++P 27865e316f8dfbf4c20290cf1be3024d7518fec46655e34f3fc435e15346c63e 6431538f0bb3bb8606786f3c3e5c055c4bc387098dd3bdc8a94f6fda61c47f52
++R a6f74894c0cda8635456b45fc1556948
  U drh
- Z 01f0a53bbc70dd3f39888afc9b26be49
 -Z decff099e336dbab63d6324042d80ad4
++Z d0677700c03f1b93b120f5cc4adf200f
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index bb04681b1f8b272f3ee316836a28c32d86cc8215,e1d7770bd6e5cc92e0e0d6b7a95a65f694ba8f90..c911a505d2392f2149f66febfefb8b620a9bba60
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 27865e316f8dfbf4c20290cf1be3024d7518fec46655e34f3fc435e15346c63e
 -6431538f0bb3bb8606786f3c3e5c055c4bc387098dd3bdc8a94f6fda61c47f52
++287ff24b26a512ff7648679767e68244f6eef95df6a49c46ed1f2594030ed523

diff --cc src/resolve.c
Simple merge