From: drh <>
Date: Fri, 14 Oct 2022 19:56:58 +0000 (+0000)
Subject: Merge fixes from trunk.
X-Git-Tag: version-3.40.0~134^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=260ac72722f085f3bd079d255b9cbb13269892fe;p=thirdparty%2Fsqlite.git

Merge fixes from trunk.

FossilOrigin-Name: 1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52
---

260ac72722f085f3bd079d255b9cbb13269892fe
diff --cc manifest
index 573214d62d,df43c1449f..e6e98f6967
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Cancel\sIndexExpr\sobjects\swhen\sthey\sgo\sout\sof\sscope.
- D 2022-10-14T02:00:54.507
 -C Fix\sa\sproblem\swith\susing\sthe\spush-down\soptimization\son\scompound\sSELECTs\swhere\scomponent\sSELECTs\suse\sdifferent\scollation\ssequences.\sdbsqlfuzz\s11516f050100243e5a845f5a2b48a90ed2efaf2e.
 -D 2022-10-14T19:30:34.777
++C Merge\sfixes\sfrom\strunk.
++D 2022-10-14T19:56:58.085
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -567,19 -567,19 +567,19 @@@ F src/date.c 94ce83b4cd848a387680a5f920
  F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
  F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 -F src/expr.c d199850a925665df7f8ac29fa938909f65a2bd32354aa206aa8c25fc74ff3d3d
 +F src/expr.c b60036e4bb9080c741a970df3b3cfffc6292aadec3670b7b04bfae6f662ff245
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
- F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1
+ F src/func.c fe2a795ad647ce42054873ac91c43beb7b5d204892903a67f6e7e314379b9d4a
  F src/global.c e83ee571b79ee3adc32e380cf554cf1254bc43763d23786c71721fbcdfbbb965
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c aea5361767817f917b0f0f647a1f0b1621bd858938ae6ae545c3b6b9814b798f
 +F src/insert.c b972b1642cd0f7d5ae4964d713b65158a7bfa6a6e8786a9e8e57bd9c0b4a896d
  F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
- F src/loadext.c 853385cc7a604157e137585097949252d5d0c731768e16b044608e5c95c3614b
+ F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
  F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
  F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@@ -2031,8 -2031,8 +2031,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 2e8d4fd4cfd9e82f33c707ba246fe2bb3ca01762cf5ac5905058fbc7adf0abe7
- R 6e639b412a6a288ed64157bd3e723cf0
 -P 565d74c36f2dd4612860c7ee561682c50db28cfa5384346528292019dbfdf86c
 -R 75e7f9b91b017a681d1ae11ac5186379
 -U dan
 -Z 42c84fae9e00b1c8a3d198c324edcd95
++P 0963519371bb7ac02adb323430855760fb9b82a23745e47c504aaf393d22ac34 ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
++R a9b714ce8ec9ca5df691ed405bb47472
 +U drh
- Z c5e6e161a1559a577698a45d0fdb903e
++Z 5b8c2826f1d75c8b25b3831a35d10fbe
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 78c84b6668,65ef760f0e..2169956f70
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0963519371bb7ac02adb323430855760fb9b82a23745e47c504aaf393d22ac34
 -ed14863dd72e35fa3a23320c3d5a8166515faea39a555c28a27b2d35e701eac4
++1cb65f36c3539302767f551ed53082f054666a7cb2696cef0990ab6747edbc52