From: drh <>
Date: Wed, 1 Dec 2021 21:07:05 +0000 (+0000)
Subject: Merge trunk fixes into the bloom-filter branch.
X-Git-Tag: version-3.38.0~186^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=879ac4d6732a22da82eea7950bc54a1f0a23fbbf;p=thirdparty%2Fsqlite.git

Merge trunk fixes into the bloom-filter branch.

FossilOrigin-Name: 0864bfbf079a98beaa484911edb17c3dc728e78eca231d4247b282fd824cc098
---

879ac4d6732a22da82eea7950bc54a1f0a23fbbf
diff --cc manifest
index 8fae6a4e21,879da8796e..ed56c9beaa
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\sBloom\sfilter\sto\sthe\sautomatic-index\smechanism.
- D 2021-12-01T16:31:02.486
 -C Check\sfor\sforeign\skey\sconstraint\serrors\sprior\sto\sreturning\sthe\sresults\sfrom\na\sRETURNING\sclause.\s\sSee\s[forum:/forumpost/793beaf322|forum\spost\s793beaf322].
 -D 2021-12-01T19:17:14.951
++C Merge\strunk\sfixes\sinto\sthe\sbloom-filter\sbranch.
++D 2021-12-01T21:07:05.915
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -555,7 -555,7 +555,7 @@@ F src/shell.c.in 975f268ef261773fcbed1e
  F src/sqlite.h.in 5cd209ac7dc4180f0e19292846f40440b8488015849ca0110c70b906b57d68f0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8ff2fd2c166150b2e48639f5e506fb44e29f1a3f65031710b9e89d1c126ac839
- F src/sqliteInt.h a44a3474b2247a82decc17644c68e00db5ba1bc239a6c005f6c08f6599083c01
 -F src/sqliteInt.h 375bb03b5c2de4c3e2f746e6205f01b8a51abd5835a1a72ab9a1c027f5c9849e
++F src/sqliteInt.h 4a19ff088cc3bb1467cca94011eaf7e8432476124bbb72c77053d9f1e6b0a6c7
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -622,9 -622,9 +622,9 @@@ F src/upsert.c 8789047a8f0a601ea42fa025
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
  F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
- F src/vdbe.c a77525ddf690771b13db4114dce5305657efe6b7393920f2cbaa2447e8b83129
 -F src/vdbe.c f25438ea079ff2a363c2cc0b70f3178fcf48d3c82ebe72534736a702a4d0eb54
++F src/vdbe.c d4435e88e8abb076c955ee8262f548afcba77daa28b75f937ed914404bb29be7
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 -F src/vdbeInt.h 31fbabdc1ed61d9695337dfe5269ea94e1cf615c17f5cafeaa1bb01066820bab
 +F src/vdbeInt.h fd1103c7ecec8c84164038c8eacaa4a633cb3c10a2f725aae7bd865d4a4fcceb
  F src/vdbeapi.c 22c79072ae7d8a01e9bcae8ba16e918d60d202eaa9553b5fda38f99f7464d99a
  F src/vdbeaux.c 21db442d159fd745a7693d157b5f998260b6af4ca60de559fa3b7b68c7405af2
  F src/vdbeblob.c 29c4118f7ee615cdee829e8401f6ead1b96b95d545b4de0042f6de39c962c652
@@@ -1933,10 -1933,7 +1933,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 664b461bb5063d98047fc2e51a3827235cd9f55ca2e23cb66e719eac53fb5437
- R 157be6898a36d49d7a017b78b4cdbad6
- T *branch * bloom-filter
- T *sym-bloom-filter *
- T -sym-trunk *
 -P 8c986782547211098eb0e4e722eda0097421223af279381373d0055211b5e9d2
 -R 21e311cc3a849b363a459e68e73e4039
++P 50ac4de1d7cbb586ea7969e1ae80ea8b021e194edc2fa7db19374b4ee9369bee a818ba2ed635b91e279dde44236fc7446a33db2b46c9409b67021248c01bf4e5
++R 890b5445e197091ccaaa040621e42f1c
  U drh
- Z 5c7d4c8ea12d463e648cb44a868717dc
 -Z aa1759274fb4dd09e62bccb20e559386
++Z bba2c27b0261227719d25ee9783d113a
diff --cc manifest.uuid
index 2cbf640244,22dfac2e19..e164a01dd8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 50ac4de1d7cbb586ea7969e1ae80ea8b021e194edc2fa7db19374b4ee9369bee
 -a818ba2ed635b91e279dde44236fc7446a33db2b46c9409b67021248c01bf4e5
++0864bfbf079a98beaa484911edb17c3dc728e78eca231d4247b282fd824cc098