Merge latest trunk changes into this branch.

FossilOrigin-Name: 72f7807b34eee1fcfd94f72d27535e5273ed1f7ff3d464179a774b7c7241f5f5

diff --cc manifest
index f7b9a608f3079c1fb85c6ac34b5a16295fc099cb,26ed34f8d1329f04c16fa40e866cd26a502e48ca..08630261303e02e1f60dbdd9828851940e7f476a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\sjson_remove()\sbug\sfix\sfrom\strunk\sinto\sthe\swal2\sbranch.
- D 2023-08-04T13:24:40.223
 -C Minor\scleanups\sin\ssqlite3Int.h.\s\sBy\sreordering\ssome\sfields\sin\sthe\sParse\nobject,\sit\spacks\smore\stightly\sand\suses\sless\smemory\sand\sless\sCPU\sto\ninitialize.
 -D 2023-08-08T17:36:03.881
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2023-08-10T17:03:33.071
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -509,10 -508,10 +510,10 @@@ F ext/wasm/api/sqlite3-api-worker1.js 9
  F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
  F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256dfb4f96555b865dbb7a6b65e379
  F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25
- F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 54cee22aacadb9dfaea438d72ac0882249d028c37903208d48c52871290ceff7
+ F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js abb69b5e008961026bf5ff433d7116cb046359af92a5daf73208af2e7ac80ae7
  F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js e7a690e0e78ff4d563f2eca468f91db69f001ff4b79c6d2304cbb6f62dca437d
  F ext/wasm/api/sqlite3-wasm.c 8867f1d41c112fb4a2cfe22ff224eccaf309fcdea266cee0ec554f85db72ef0f
 -F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bc06df0d599e625bde6a10a394e326dc68da9ff07fa5404354580f81566e591f
 +F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js f10c3ecd9df06f6320073c2ce230a7ed7c56034d8b88c1e57095f2a97faf423a
  F ext/wasm/api/sqlite3-worker1.c-pp.js da509469755035e919c015deea41b4514b5e84c12a1332e6cc8d42cb2cc1fb75
  F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
  F ext/wasm/batch-runner.js 0dad6a02ad796f1003d3b7048947d275c4d6277f63767b8e685c27df8fdac93e
@@@ -715,7 -714,7 +716,7 @@@ F src/upsert.c 5303dc6c518fa7d4b280ec65
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b3532a95ad56db67b3acd3955e688e4cb80ebec6fd1f459a8eb51cceedd6de69
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- F src/vdbe.c 291ce57dbcf10eff4c1e7ff76c11e81f6b1e012f5209662b8a93ff4c42be2740
 -F src/vdbe.c 346d848a0bf8128e3e3722c5406f4bde6c32d7093b93402c6f8e0718d19305c3
++F src/vdbe.c 11f1a00443991bd12bd0c97050b2614f7fd3e82b9cc0ffdb13d14d424d733e77
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c f37822f215740ede2a8fcae99bc13f2cc3a72dd0e1d22b81b9298c5ca67dbc38
@@@ -2063,8 -2050,8 +2064,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 6fa71e11197111ab52d1983b35190899a5881dcb9ed822488c92bc839c72cb55 ba7a66db13b28da0b41f03be825a593608474a5ebda89e12d58d89db709b8f65
- R cef0de709be49642d9e25d028826ad6e
 -P 293f6191e9b328cb8a8d3fff0f7bd5a6f5390b5ff090497a170c791b6ea22917
 -R 13de6fab3751f215b8cb399b0a8433e9
--U drh
- Z e02f148a6f9cb0e9347800ebbe37eb6f
 -Z 9646a5d58abf6d956e75b2b4249fce92
++P e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7 aa6de539c09faa320b68c63659e602107145c4263fa680d5b40fe4d7d7ac4534
++R f99f5fc942bd03ff500daadad5540cf1
++U dan
++Z ffac72e58a992aabc015a8c1dc573638
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 3a11512e6958a6560943e549e49dab233b6a687b,a11170fc8e1354bd843717742c10a8ff932ed74e..b87b04233d1bd1dab474eb50dd078ed814f69a79
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e6c066cae4ed5d698820c0c1ea8840773146e9d1a665551d8d51bb9df121cdb7
 -aa6de539c09faa320b68c63659e602107145c4263fa680d5b40fe4d7d7ac4534
++72f7807b34eee1fcfd94f72d27535e5273ed1f7ff3d464179a774b7c7241f5f5

diff --cc src/vdbe.c
Simple merge