From: drh <>
Date: Fri, 24 Nov 2023 12:38:54 +0000 (+0000)
Subject: Merge 3.44.2 changes into the wal2-3.44 sub-branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5d03adb7dbbcad7c92a7af37f3b497075ad7a6f;p=thirdparty%2Fsqlite.git

Merge 3.44.2 changes into the wal2-3.44 sub-branch.

FossilOrigin-Name: 0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c
---

c5d03adb7dbbcad7c92a7af37f3b497075ad7a6f
diff --cc manifest
index 58a8ee7629,1041b8b170..81c2119662
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sthe\s3.44.1\spatches\sinto\sa\ssub-branch\sof\swal2.
- D 2023-11-22T15:34:38.715
 -C Version\s3.44.2
 -D 2023-11-24T11:41:44.921
++C Merge\s3.44.2\schanges\sinto\sthe\swal2-3.44\ssub-branch.
++D 2023-11-24T12:38:54.644
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in bddd493839ce057414b19cd405293363f7efb7a73a3d8f6d2ed1b59943ddfcb1
 +F Makefile.in a116e61f0fcf16c2305a70e40be4c2c7b236a3a6c1ce09c3263575cf8493bb69
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 -F Makefile.msc 59bb36dba001f0b38212be0794fb838f25371008b180929bcf08aa799694c168
 +F Makefile.msc e7455bcbcd4853c5c6980d15d5217ff720aeb6f1c0256117929332554c106c19
  F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
- F VERSION ac9b892c8f54be4e11be490d721ae6a22b0ba83f1a4b247cdda14d82b4d941cc
+ F VERSION 672a5ddf487d19856d8b1015797e14578fd8f8d59c14d9832ab0fe5938c6ab9b
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -795,11 -794,11 +796,11 @@@ F src/upsert.c fa125a8d3410ce9a97b02cb5
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c b22cc9f203a8c0b9ee5338a67f8860347d14845864c10248bebe84518a781677
  F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- F src/vdbe.c 368941ee51df5d8ff60f6c72c2fe5f9c6a78e70a4e1956a400e49de28e273f09
 -F src/vdbe.c 1cfb61c58193dcb74e8e0f90dc1405ff7fe39f43a1e9bdd38329e174f2102ed4
++F src/vdbe.c 7bd1c8301f01b1febaaeec52d5df62fcaf83f5e90ba9326f8b18470b4d52836a
  F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c dd812ddd2f7806519e9d492c820456f86628bb6014b559034506e7f9d7f683c5
- F src/vdbeaux.c c572ba5dd18ca6b512c0c29352e6fe9039d5196af852853b84570870c5332969
 -F src/vdbeaux.c 16f27624831aa6663fe5927b647a0a54dfda0088da9b170ebc14bce98c5ac414
++F src/vdbeaux.c b51bdb7b2c6d17af604fb187bb22775e38cbca9e4e3f485a06a5fb7a6f9c21ca
  F src/vdbeblob.c 13f9287b55b6356b4b1845410382d6bede203ceb29ef69388a4a3d007ffacbe5
  F src/vdbemem.c 0012d5f01cc866833847c2f3ae4c318ac53a1cb3d28acad9c35e688039464cf0
  F src/vdbesort.c 237840ca1947511fa59bd4e18b9eeae93f2af2468c34d2427b059f896230a547
@@@ -2155,11 -2142,10 +2156,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 470152fd2847296e0fc325fdf098e49c888e99a2332fb45533f976ad85a67d8d d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4
- R 4a6213b9edb53d1487e0ee898b5e9470
- T *branch * wal2-3.44
- T *sym-wal2-3.44 *
- T -sym-wal2 *
 -P f796da626b5c3b099cc246a8b46d92839922e34f398d673b0b03d7ee33a28a60
 -R 1ffc537351df4c25512f7c1fd5cd9511
 -T +sym-release *
 -T +sym-version-3.44.2 *
++P 2672572cc373e97054cc56dd0d48aaf56be5fef9704f7c177f64bd622151eadb ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f
++R 79dd4db7e84abf2dfef496293e208c75
  U drh
- Z a17476ba3fc49d737ed8e4774ccaf1f3
 -Z abd52f0184ebdbba1837e841b542823e
++Z c2e274816d57ff4863e5f579538a274a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 09e7987145,3e2da7b0c1..f5c493a1dd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2672572cc373e97054cc56dd0d48aaf56be5fef9704f7c177f64bd622151eadb
 -ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f
++0118e8c981fdfa4f8e593b56a2cbb97c489c3a97a3494f21a7a63b196659530c