]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the 3.43.2 release changed into the reuse-schema-3.43 branch. reuse-schema-3.43
authordrh <>
Tue, 10 Oct 2023 13:55:07 +0000 (13:55 +0000)
committerdrh <>
Tue, 10 Oct 2023 13:55:07 +0000 (13:55 +0000)
FossilOrigin-Name: 5fefa147ca4703e883670f0d65f8ea32c64474f1ca6a0d50d691cc677b987b71

1  2 
Makefile.in
manifest
manifest.uuid
src/shell.c.in
src/vdbeblob.c

diff --cc Makefile.in
Simple merge
diff --cc manifest
index c27ff3a1fa38461f0b3d5bd0b03c611109a196fc,9b302487f378f8a8b4fcb5ea7fc2a9b52e777ae7..173eabd41bd689647bb6ec52cb3a0bc672f2962a
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion\s3.43.1\sinto\sthe\sreuse-schema-3.43\ssubbranch.
- D 2023-09-11T13:06:54.520
 -C Version\s3.43.2
 -D 2023-10-10T12:14:04.911
++C Merge\sthe\s3.43.2\srelease\schanged\sinto\sthe\sreuse-schema-3.43\sbranch.
++D 2023-10-10T13:55:07.125
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in ea43c8591f7b3799e6774843b8b728cfef63e39f6e18be8efac80fcceefc4c72
 -F Makefile.in 0f17b4b3550aae10deb5475429a2388a0960ebe85a29d1dd97aa0a2444b0bf48
++F Makefile.in 9a778ee7f4c02fdd742a80f690830059a5ff8afcae557212666502e9d6dc619b
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 -F Makefile.msc 26c2d196391a285c279adb10fd6001774d9b243af94b700b681e4a49cd476684
 +F Makefile.msc dc507b7af6d6d82ebdaaa17fd55f33e31d950933aa6e38a8c5d9e2cc1336c2d2
  F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
- F VERSION 536457fc6444f62ad9e5082a82e4e190f7ba3f4d903a63b835835230f7a8f853
+ F VERSION 56b287eac8404526c4faa0bdfa7e31baed534068fa3acece479b5d6c35cfca1e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -624,13 -623,13 +624,13 @@@ F src/auth.c 19b7ccacae3dfba23fc6f1d0af
  F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
  F src/bitvec.c 9eac5f42c11914d5ef00a75605bb205e934f435c579687f985f1f8b0995c8645
  F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
- F src/btree.c 7a37bdf09f338561880860681cb03499a60c3bb0869e539c58bc1d2cdd705ff2
+ F src/btree.c 15611f72bd65aef23b3ae4026164f86e2466791be5b9745f8421d0eed3c5238a
  F src/btree.h 03e3356f5208bcab8eed4e094240fdac4a7f9f5ddf5e91045ce589f67d47c240
  F src/btreeInt.h 91a9e0c41a0e71fa91a742ec285c63dd8dcb38b73d14fae0ed7209174ff0fdc1
 -F src/build.c a8ae3b32d9aa9bbd2c0e97d7c0dd80def9fbca408425de1608f57ee6f47f45f4
 -F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
 +F src/build.c 9b97abdac57ad46e42e7a65406ba4aed5838cfd885770f6d6c4ae4f038c901e1
 +F src/callback.c fbd4e8247f1a7f37aec721bde0e312e79cc3bfa41f55a59930bc876ca6baf455
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c cff2b493de894383832347c3a3f936a05f4e089a92b42366838da1735f3848b5
 +F src/ctime.c 1cf5701f34089ae3d73c6863d27b644d105a70976939ccdc1ea9beda9aaa6b32
  F src/date.c f73f203b3877cef866c60ab402aec2bf89597219b60635cf50cbe3c5e4533e94
  F src/dbpage.c f3eea5f7ec47e09ee7da40f42b25092ecbe961fc59566b8e5f705f34335b2387
  F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
@@@ -645,10 -644,10 +645,10 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 51141f1c09ccb177057e5813e6302a5e32e5ba88cc4a756318a35081010fc6df
+ F src/json.c 5c25f82e1c0f3eb44fb9a23feff6b7b952fd40122d9e3ab601a84ea83710a980
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 -F src/main.c fde8f13c876a658b4e8b74b77d875ca887915c174ea6a2f3122d80966f93d865
 +F src/main.c 05d0d3c48326d07f17195035a847fd26ef9386932fda0b17ee91b52b4245170f
  F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@@ -686,15 -685,15 +686,15 @@@ F src/random.c 606b00941a1d7dd09c381d32
  F src/resolve.c 37953a5f36c60bea413c3c04efcd433b6177009f508ef2ace0494728912fe2e9
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c e9fb48546ab1882639a3a960383f6342dddb776c0227615f8e19de51f0102f68
- F src/shell.c.in ab89ecd4ca2ae691ff444c9e514920e7c94374133768b7aa8fd2d144116b37a0
 -F src/shell.c.in d381ea090c17db5d50049e6c06e9e175d8d712c7f9bc7a0b8a51616af44f060c
 -F src/sqlite.h.in 73a366c1c45d5ac9888cfe81c458826a44498531d106cfb4f328193ab5f6f17d
++F src/shell.c.in 7b8ea265d114c1c4c16c5e12fad12624354e3c7e6cce26fd05df7cd5f2a0d908
 +F src/sqlite.h.in e749ae7dceb44608ecff703885e87b56e12e292962c4dd4d8e6ab924f7efe0ab
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 2f30b2671f4c03cd27a43f039e11251391066c97d11385f5f963bb40b03038ac
 -F src/sqliteInt.h 025ed58a41968ef80d64cdc194caa8dd207b0256b147253d762fdac7a62408f9
 +F src/sqliteInt.h e3189cb39d81d73296d4fcf484d43daa66894131e9e397da93b6f0bab66829a9
  F src/sqliteLimit.h 33b1c9baba578d34efe7dfdb43193b366111cdf41476b1e82699e14c11ee1fb6
 -F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 +F src/status.c 501433a8bdf64be125746a53bb9180761f9364428b59b318365eb88afd6d5cea
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c ecbc3c99c0d0c3ed122a913f143026c26d38d57f33e06bb71185dd5c1efe37cd
 +F src/tclsqlite.c df375d63a3b0f06e79f29b6876c228c8896599497d6f54adbcd12d7d71b3162d
  F src/test1.c ebba2473874a23add4a10881b90bd445cfa7f59f90749434938aec14239c6486
  F src/test2.c 54520d0565ef2b9bf0f8f1dcac43dc4d06baf4ffe13d10905f8d8c3ad3e4b9ab
  F src/test3.c e5178558c41ff53236ae0271e9acb3d6885a94981d2eb939536ee6474598840e
@@@ -754,14 -752,14 +754,14 @@@ F src/trigger.c 31ec6667245182684d7d9c6
  F src/update.c 6904814dd62a7a93bbb86d9f1419c7f134a9119582645854ab02b36b676d9f92
  F src/upsert.c fa125a8d3410ce9a97b02cb50f7ae68a2476c405c76aa692d3acf6b8586e9242
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 278b81c3b33db1b5a5f3859adf8905c165b910080043061d44d3c5a25b4b406d
+ F src/util.c 79f084901f52d9d7025200a177f7d1d66f83a73333fe486a2626490eaa49bc4c
 -F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
 -F src/vdbe.c 346d848a0bf8128e3e3722c5406f4bde6c32d7093b93402c6f8e0718d19305c3
 -F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0
 +F src/vacuum.c 5bc892883611a65ca75b4129bcf5cf8b0908564b357373fdeee364d3b1af7cd7
 +F src/vdbe.c 3ef6fd63dd5d7cd2eb1370c6e302174048d42fbaaa5ee27967b76debcd2d4673
 +F src/vdbe.h 68fcbf7e5e8dd2094bc712fe4198216657272c978a7e93dbdb7e6ff5791c634c
  F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
  F src/vdbeapi.c 37341acd781fda162e8cf4d9fc2eaea2febad3b365877a9d7233b8c6d0960d85
 -F src/vdbeaux.c e3aa5c46827cd95e0fc4d0f302fa3e901ab5f07258fdbb42709eeef40f63018d
 -F src/vdbeblob.c 4cf5aa130e96e3b52ba3fb54b7f9606c942ab988dbb32cb19cff4db24e06aeec
 +F src/vdbeaux.c 4dabe4beb01b71186438a4c994b57086b2594a49e19613d3b86d9362e5e496e7
- F src/vdbeblob.c ba635408951656b81ca96d1f6b244702de859b21def3ce480552c485b2c6353a
++F src/vdbeblob.c a82465872ab124416bd55c4485f4a267472ad990b0aa08cc55035d26785dbbbe
  F src/vdbemem.c 317b9f48708139db6239ade40c7980b4bc8233168383690d588dad6d8437f722
  F src/vdbesort.c 0d40dca073c94e158ead752ef4225f4fee22dee84145e8c00ca2309afb489015
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -2102,8 -2093,10 +2103,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 c94be4600d6772876a15b53874142c88793b3731fd92d5d427ea931c0cfcf70c 2d3a40c05c49e1a49264912b1a05bc2143ac0e7c3df588276ce80a4cbc9bd1b0
- R e3563cfbe47c72d68040d8859034ad2f
 -P 88a118905b95bd82e15c3c1e63a7620071ab9ab3517b77820553fcd7e600b0c8
 -R 066b49c963926ac90c34ea41a60520db
 -T +sym-release *
 -T +sym-version-3.43.2 *
++P d96586b51b591608f3dbae9a1dd201ce10f1f700b77d913487e6c269af42100d 4310099cce5a487035fa535dd3002c59ac7f1d1bec68d7cf317fd3e769484790
++R 69257dc7955d22966fa2e56db1cba65a
  U drh
- Z 75a2c405caf6fc25ec51e50fc8c273b6
 -Z 8f5f6e60777c4954f5d2670202697dfe
++Z e3af5bef3c979f2047f2124e290983dd
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7fbba344e63296f8fd1625d9b503d330a1c832fa,3d79d43ed0fa2ded5d0ca532212a5728daf38559..1782286173620d9c00f17974ceff2b908868f739
@@@ -1,1 -1,1 +1,1 @@@
- d96586b51b591608f3dbae9a1dd201ce10f1f700b77d913487e6c269af42100d
 -4310099cce5a487035fa535dd3002c59ac7f1d1bec68d7cf317fd3e769484790
++5fefa147ca4703e883670f0d65f8ea32c64474f1ca6a0d50d691cc677b987b71
diff --cc src/shell.c.in
Simple merge
diff --cc src/vdbeblob.c
Simple merge