From: drh <>
Date: Mon, 17 Oct 2022 16:31:55 +0000 (+0000)
Subject: Merge trunk changes into the index-expr-opt branch.
X-Git-Tag: version-3.40.0~134^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79b99b09fa92d65d3ad065731e9f6392300bc120;p=thirdparty%2Fsqlite.git

Merge trunk changes into the index-expr-opt branch.

FossilOrigin-Name: a1485ce6c8374135290eb0a1e4eb4e225497ad7096847a4e2377c9c054946ca7
---

79b99b09fa92d65d3ad065731e9f6392300bc120
diff --cc manifest
index 99d55d9f43,215cd1c292..75da856216
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improved\scomments\sand\sfunction\snames.\s\sNo\slogic\schanges.
- D 2022-10-17T14:46:39.146
 -C Fix\sa\spotential\scall\sto\sstrlen()\swith\sa\snull\sargument\sin\sthe\scommand-line\sshell\nfollowing\san\sOOM\serror.\s[forum:/forumpost/9c4f2ebe22|forum\spost\s9c4f2ebe22].
 -D 2022-10-17T16:09:33.721
++C Merge\strunk\schanges\sinto\sthe\sindex-expr-opt\sbranch.
++D 2022-10-17T16:31:55.281
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -533,7 -533,7 +533,7 @@@ F ext/wasm/testing-worker1-promiser.js 
  F ext/wasm/testing1.html 50575755e43232dbe4c2f97c9086b3118eb91ec2ee1fae931e6d7669fb17fcae
  F ext/wasm/testing2.html a66951c38137ff1d687df79466351f3c734fa9c6d9cce71d3cf97c291b2167e3
  F ext/wasm/testing2.js 88f40ef3cd8201bdadd120a711c36bbf0ce56cc0eab1d5e7debb71fed7822494
- F ext/wasm/version-json.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
 -F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144
++F ext/wasm/version-info.c 03c6fb4efefd7c5b14f618b36648e71da741e39059ea5059c39495fdceaed144 w ext/wasm/version-json.c
  F ext/wasm/wasmfs.make 3cce1820006196de140f90f2da4b4ea657083fb5bfee7d125be43f7a85748c8f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@@ -2033,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 8a510cb0880349370ad19b0852f270ca072bff7871f0dc272964af31c32a7c37
- R 2b7b8043aec8092eea598ea28e3a1178
 -P e9b407a4d0a0fcd9f26d457beede19d41141327befe84be621681952be5d1e69
 -R fd5bd78c383b3a5ac313c836d503f5ef
++P 8f460b3b15bf4b88a224907d2f83e4ed6bf84d6b3f480008a1b187ea49c6ce1d b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
++R b72777913e19bbbdbff94b30aa294e78
  U drh
- Z e241a4932bd8de7b16432b2f0cb5fca6
 -Z 6ca21d53ba6df71519b0f06bf84205e6
++Z f862d5509bce1d889210db6919a1c731
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 6dd4259d17,0b5ebb0171..4b71e361ca
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8f460b3b15bf4b88a224907d2f83e4ed6bf84d6b3f480008a1b187ea49c6ce1d
 -b6413a6dff8ac9b7088b1381afbbbf799e376455d11786530cc5fc825747ab53
++a1485ce6c8374135290eb0a1e4eb4e225497ad7096847a4e2377c9c054946ca7