From: drh <>
Date: Tue, 3 May 2022 16:26:50 +0000 (+0000)
Subject: Merge Bloom filter bug fix from trunk into the right-join branch.
X-Git-Tag: version-3.39.0~166^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fright-join;p=thirdparty%2Fsqlite.git

Merge Bloom filter bug fix from trunk into the right-join branch.

FossilOrigin-Name: 72131ad1bda3d087e59cd4a51d87f10f65a55e658645397e1ede15f9fb1f5143
---

eeada074578d91579c17e700c6aeceba1e499a7f
diff --cc manifest
index bc4459427d,81a7fdb108..ee3ff2d43c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\stypo\sin\sa\scomment.
- D 2022-05-03T16:18:25.563
 -C Fix\sthe\sBloom\sfilter\spull-down\soptimization\sso\sthat\sit\sjumps\sto\sthe\scorrect\nplace\sif\sit\sencounters\sa\sNULL\skey.\s\sFix\sfor\sthe\sbug\sdescribed\sby\n[forum:/forumpost/2482b32700384a0f|forum\sthread\s2482b32700384a0f].
 -D 2022-05-03T14:01:48.589
++C Merge\sBloom\sfilter\sbug\sfix\sfrom\strunk\sinto\sthe\sright-join\sbranch.
++D 2022-05-03T16:26:50.091
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -640,11 -640,11 +640,11 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 -F src/where.c 43085b3a4ce2e56315fabb0b240a56e76667d9e03c79f287695bcae7b76152d5
 +F src/where.c eb86c068e8e24a1e0a650beb20573bd5648fe1584f11d5bdffaf17ec3de52b5d
  F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
- F src/wherecode.c dfc3fbb6b7cb14a5a8e022d22f4d2c6004807e458a7cd8278194fbef7c1670e1
+ F src/wherecode.c cd9da760d391a51013f9ab8bc8ca7ad67f3b96e4857efe0d1dd85f538b3494a6
 -F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249e5
 -F src/window.c 924e04fd6e0e113d4dba18b78d43fcb8e42b8ebffc8fc728da52cf3ab014cf3c
 +F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622
 +F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test b5c19d504dec222c0dc66642673d23dce915d35737b68e74d9f237b80493eb53
@@@ -1952,8 -1951,8 +1952,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 5341d4bbe9a943f9cdbbdea829e18f108e98972ebb706396c50fc62fcc6a6328
- R 57e92245f83a453fc0fb383304aceb64
 -P 8f8a58feb7047d19522ca32efbe42fd9ddf49aaf9064f7373eb56a88982406a2
 -R 48e95e8ad10915971573fc98c5fba3fb
++P c19c3c48698bf2543d775411c62d01e629791e2f3c5317970fdbb830eacafac6 6eda9b1a7784cf6d58c8876551f67ab98e78a08e726a0579d4def5ba881985bb
++R 2d89cb1e36090ec16d6f7a3a0d57b198
  U drh
- Z acf0fb1e4a92d1326c45eaf045dbeceb
 -Z 4d1d0f66bed5171c72952a11ac9180b2
++Z bc3c00e875924c9bd573570421780b97
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b6a3d3f753,b5b28cd857..a68027180c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c19c3c48698bf2543d775411c62d01e629791e2f3c5317970fdbb830eacafac6
 -6eda9b1a7784cf6d58c8876551f67ab98e78a08e726a0579d4def5ba881985bb
++72131ad1bda3d087e59cd4a51d87f10f65a55e658645397e1ede15f9fb1f5143