From: drh <>
Date: Mon, 18 Apr 2022 16:23:01 +0000 (+0000)
Subject: Merge the btree bug-fix from trunk.
X-Git-Tag: version-3.39.0~206^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25f2ce6e71fb39c2bff4282ddba5fed45a376cbb;p=thirdparty%2Fsqlite.git

Merge the btree bug-fix from trunk.

FossilOrigin-Name: a333c0b50c3af7cd818470a647d78c7c691ef15418ec7cffe80dd88405393069
---

25f2ce6e71fb39c2bff4282ddba5fed45a376cbb
diff --cc manifest
index 34c4db93e0,141bae7e73..ce2e243173
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthat\sleft-hand\sside\sWITHOUT\sROWID\stables\sare\sset\sto\sOP_NullRow\sprior\nto\srunning\sthe\sright-join\sloop.\s\sThis\sfixes\sa\sproblem\sintroduced\sby\sthe\nprevious\scheck-in.
- D 2022-04-18T16:20:59.567
 -C Avoid\san\sassert()\sfailure\sin\sallocateSpace()\striggered\sby\sa\scorrupt\sdatabase.\sdbsqlfuzz\sf022eb0ce64d27808574d1dcde5cf7d002dabde8.
 -D 2022-04-18T15:56:58.902
++C Merge\sthe\sbtree\sbug-fix\sfrom\strunk.
++D 2022-04-18T16:23:01.233
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -492,10 -492,10 +492,10 @@@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa2
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 093c940ddf1d0753542d04e37eb9903cbc126e997815d234dd2b6317e812b192
+ F src/btree.c df695e953c2ce78ce4878ee5016751df9bc9a921dc0500a0f53ab3bb3196e505
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
  F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 -F src/build.c ff119be98394a65bc8be7afc39d4a791a66f03a778d396de3ec456f5dfaf39e8
 +F src/build.c f7098ca5006891b1877fb2e8f9aa52243338983696123f5a4e30fa9dda06debc
  F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
@@@ -1948,8 -1945,8 +1948,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 95b242d4c2fed7c713299565ac1010f8a7534a5695589e87d5a0204c7bf5f3dc
- R 64e006161878d7a0b97de4889394a4bc
 -P 1b2c5cef9560123344db391cd065090d1914724715ec6643d2d9b5fac2051a21
 -R e0f5c0c7d688fc682a2227f01f890489
 -U dan
 -Z ae7698eacadb5d5e1bd63dbe1476a21d
++P aab7665ce6c004df701a72aef1a5135f2c78f16c6ff728a00076afb66ba9d3a0 2de7f8cc7fe18f0828bb53f1fd11f5eb828faf4d6dfaf39693dff4f8926c1c7a
++R c2bad799ccc2e68c52faa7ef529226a2
 +U drh
- Z 861a84ea03f43168120caaccf0f7691d
++Z af5a0bcb393fda3761d5ef89c60ee039
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 65011899de,f29a4816df..f815780a9b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aab7665ce6c004df701a72aef1a5135f2c78f16c6ff728a00076afb66ba9d3a0
 -2de7f8cc7fe18f0828bb53f1fd11f5eb828faf4d6dfaf39693dff4f8926c1c7a
++a333c0b50c3af7cd818470a647d78c7c691ef15418ec7cffe80dd88405393069