From: drh <>
Date: Fri, 3 Dec 2021 16:02:05 +0000 (+0000)
Subject: Merge recent trunk enhancements into the bloom-filter branch.
X-Git-Tag: version-3.38.0~186^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b0590552140c76b1534ac1c8cb247a682ca12b6;p=thirdparty%2Fsqlite.git

Merge recent trunk enhancements into the bloom-filter branch.

FossilOrigin-Name: 11d97fb8be6b5155f38df130d7e828edd0f381e32f651458939b1cb9cb973fff
---

2b0590552140c76b1534ac1c8cb247a682ca12b6
diff --cc manifest
index ed56c9beaa,e2d4a70289..ec9c79c888
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\sfixes\sinto\sthe\sbloom-filter\sbranch.
- D 2021-12-01T21:07:05.915
 -C Fix\sexprAnalyze()\safter\srecent\sperformance\senhancements\sso\sthat\sit\sis\sable\nto\shandle\sIF_NULL_ROW\sopcode\scorrectly,\sagain.
 -D 2021-12-03T15:48:42.503
++C Merge\srecent\strunk\senhancements\sinto\sthe\sbloom-filter\sbranch.
++D 2021-12-03T16:02:05.551
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -637,10 -637,10 +637,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c ed0398a7adf02c31e34aada42cc86c58f413a7afe5f741a5d373ad087abde028
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
  F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
- F src/where.c 1b8a6c53c34c59c765190484d245c457bedc211325de4c75a2070432fd67e314
- F src/whereInt.h 23f990791dc428f0bbb31f8ef5026b78b6290272de86185f4822c85f4c774803
 -F src/where.c b50391df607937593596fbb8ea39f673d9a3715a65750567b442d22dd20720ca
 -F src/whereInt.h 1630d9418512b080598e9a72b8af6b8bd1b9ab13fee1458f151762b6df206791
 -F src/wherecode.c 1f5b62f46d284c8886945eb7438415bc27e23e87bb60b9ee468fa6bd31268f33
++F src/where.c c04c4108028513cf2f264505f2bc3e861c2ed96985d7a5feead4cf76fe057dc1
++F src/whereInt.h 83ae6f7d0fce8b5164d97698790e0005a909b3d06d73df86a4a6bb0d9411861e
 +F src/wherecode.c 620e81077588a727876a86f87aab310c02fc4e4960691e48153d8a87ca1fa453
- F src/whereexpr.c 17bdbf4f5b490e70a18635498f0b910a558f953a9bf80af7f19cbde6e60e6825
+ F src/whereexpr.c 19394cb463003e9cc9305730b1508b8817a22bb7247170d81234b691a7f05b89
  F src/window.c 5d3b397b0c026d0ff5890244ac41359e524c01ae31e78782e1ff418c3e271a9e
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@@ -1933,7 -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 50ac4de1d7cbb586ea7969e1ae80ea8b021e194edc2fa7db19374b4ee9369bee a818ba2ed635b91e279dde44236fc7446a33db2b46c9409b67021248c01bf4e5
- R 890b5445e197091ccaaa040621e42f1c
 -P f3d6853ee80be2dc6d7236d98b850beb0e1931a624d4f5b194c8db742cde7ec5
 -R f7c21b32b86d486ed00c79fd5643ce8f
++P 0864bfbf079a98beaa484911edb17c3dc728e78eca231d4247b282fd824cc098 8029e6bab508bf0b8ec1df00a829c5d4de2a84d66dc56b9ff03da879ceef7788
++R 62eaa6fad42f4285b48b7186b5cb4970
  U drh
- Z bba2c27b0261227719d25ee9783d113a
 -Z 7b145c2e945c01598a45c251b2a2a878
++Z 2d614121b81c56be6760e2166ceb6c54
diff --cc manifest.uuid
index e164a01dd8,2be18ad032..8270f79647
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0864bfbf079a98beaa484911edb17c3dc728e78eca231d4247b282fd824cc098
 -8029e6bab508bf0b8ec1df00a829c5d4de2a84d66dc56b9ff03da879ceef7788
++11d97fb8be6b5155f38df130d7e828edd0f381e32f651458939b1cb9cb973fff