From: stephan <stephan@noemail.net>
Date: Thu, 25 Aug 2022 19:38:54 +0000 (+0000)
Subject: Merge changes from trunk into the fiddle-opfs branch.
X-Git-Tag: version-3.40.0~169^2~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3825e78bdcaaac7681b68a0efc3cd9a253ce9b5;p=thirdparty%2Fsqlite.git

Merge changes from trunk into the fiddle-opfs branch.

FossilOrigin-Name: 34279797be0922b9df05e0d4f327f8582ab25fb6fb21583f8441ddf5deded891
---

a3825e78bdcaaac7681b68a0efc3cd9a253ce9b5
diff --cc manifest
index 3f6cea0347,fe50b5d9fb..738a1b98a5
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Consolidate\soo1.DB.exec()\sand\soo1.DB.execMulti()\sinto\soo1.DB.exec().\sThis\sis\sa\sbit\sless\sefficient\sbut\scertainly\seasier\sfor\sa\sclient\sto\sdeal\swith\sand\slightens\sthe\smaintenance\sburden.
- D 2022-08-25T13:27:52.079
 -C Ensure\sthat\ssqlite3_prepare()\sinputs\salways\shave\sa\ssemicolon\sterminator\sin\nspeedtest1.
 -D 2022-08-25T19:29:35.476
++C Merge\schanges\sfrom\strunk\sinto\sthe\sfiddle-opfs\sbranch.
++D 2022-08-25T19:38:54.407
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 544e93e4a996b7a1cd98ce8c2381cc487068a516e84243a6251fc3ba9638fe6c
 -F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
++F Makefile.in 918d18842ba16dac5ebd5f7913aa8fb4f39879c881deced83362ed44a14ab4c6
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
  F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@@ -2009,8 -1999,8 +2009,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 0a65747047322b7b585e281ac275e437ce3f46e1d06105c19117213929a906ad
- R 14238254f8c2a9ecda72692d6551fb99
 -P 1c87d7c58d5aec83f9e2ae3771a81aa17cfae0cf06169025a5db085e2d5749f9
 -R 03aae009b62262596bf019082ce9ceed
 -U drh
 -Z 8bd158a0ccc4257762e239c65a25bd98
++P 7eff7213dff553b76d7ce45063e3c4a19544716611a0b609593d704076b38d0b c72756b0f2db30c622f00f43be9245d50e36049bd7740ee6332164f0c48f9c3d
++R 6cbaead5bd5c21e8bcf8c5222e15e555
 +U stephan
- Z 0ceace5a4ad7c624466e4c9b471faa7f
++Z 2bf8ba3c4f232c47481eaff62acadb99
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7080e62c57,8361278db9..ac06f3fffa
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7eff7213dff553b76d7ce45063e3c4a19544716611a0b609593d704076b38d0b
 -c72756b0f2db30c622f00f43be9245d50e36049bd7740ee6332164f0c48f9c3d
++34279797be0922b9df05e0d4f327f8582ab25fb6fb21583f8441ddf5deded891