From: stephan <stephan@noemail.net>
Date: Sat, 1 Oct 2022 13:45:14 +0000 (+0000)
Subject: Merge trunk into fiddle-opfs branch.
X-Git-Tag: version-3.40.0~169^2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be9d203665f470a4603966a34d35cbdc71d0a786;p=thirdparty%2Fsqlite.git

Merge trunk into fiddle-opfs branch.

FossilOrigin-Name: 64ebcbe41615a6d7776597564105ea7638e4a9095a764ea558c2620640429cf8
---

be9d203665f470a4603966a34d35cbdc71d0a786
diff --cc manifest
index 1fb4beac82,1bac28833e..2ff0e775e9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Tweak\ssqlite3-worker1.js\sto\sbe\sable\sto\sload\seither\ssqlite3.js\sor\ssqlite3-wasmfs.js,\snoting\sthat\sthe\slatter\sstill\sdoes\snot\sload\sin\sa\sWorker\sbecause\sof\san\sEmscripten\sloader\sbug.
- D 2022-10-01T13:38:27.672
 -C Replace\sthe\sParse.disableVtab\sfield\swith\sParse.prepFlags\sfor\sincreased\ngenerality,\sa\ssmall\ssize\sreduction,\sand\sa\ssmall\sperformance\sincrease.
 -D 2022-10-01T13:17:53.450
++C Merge\strunk\sinto\sfiddle-opfs\sbranch.
++D 2022-10-01T13:45:14.035
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -622,7 -593,7 +622,7 @@@ F src/shell.c.in 2980312ab57fc5ccf298d1
  F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h 587be0322bf30f248350e9b0d1d36feeece94f30bcf057686c6425c36b8ed3c5
 -F src/sqliteInt.h 7571703e6d11cd0e0283be68e9b6baceefedf10e3bbac5869d12183e031c5254
++F src/sqliteInt.h 13e1876c4694958683eac18974ebfc71ac0793f643c0956fb0ff6b8a15337dc0
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -2029,8 -2000,8 +2029,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 5636e82864457d870754ee7125c307dc5d2195197a5c0266579da9f102938b89
- R 993ef66f3fd9ce234bc978415f38aac9
 -P bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417
 -R b431f195d6909dd213769258d329fb1f
 -U drh
 -Z 5ff8e8c9111016b6f28cef573224105e
++P 000ef7059bfb54dc4f829b81a8d8c927c0382980218d8a3d60cd2c4d89151c90 b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
++R 5df8cd3132a0539ad9a559117068898c
 +U stephan
- Z e29500eccf112ba55345d53a058a1e30
++Z 7ab2cbdb07e5b8371b60f5611bb9584c
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index db57858bad,ceab8edde4..cee93bde1c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 000ef7059bfb54dc4f829b81a8d8c927c0382980218d8a3d60cd2c4d89151c90
 -b7da0bcdf70e53ab1ec00a0694e17c7429e23bc6eb3f39b622d06a930aa2f6a3
++64ebcbe41615a6d7776597564105ea7638e4a9095a764ea558c2620640429cf8