]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge version-3.38.4 into the reuse-schema-3.38 subbranch.
authordrh <>
Wed, 4 May 2022 16:46:10 +0000 (16:46 +0000)
committerdrh <>
Wed, 4 May 2022 16:46:10 +0000 (16:46 +0000)
FossilOrigin-Name: d5b0fd8434f893db444eb62e254871d92a593c3c4871641b0392453444444e15

1  2 
manifest
manifest.uuid
src/shell.c.in
src/vdbe.c

diff --cc manifest
index a8c25dc01748a2b0682d9323e20d67659c7860e2,f78bf8af2732f46fae9646599f2bbd6e52c4f77d..2be15fd04fc1dd75158fd8e3e71bbb61e0b88971
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sthe\sversion\s3.38.3\sfixes\sinto\sthe\sreuse-schema-3.8\ssubbranch.
- D 2022-04-27T13:12:16.786
 -C Version\s3.38.4
 -D 2022-05-04T15:45:55.565
++C Merge\sversion-3.38.4\sinto\sthe\sreuse-schema-3.38\ssubbranch.
++D 2022-05-04T16:46:10.610
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in b210ad2733317f1a4353085dfb9d385ceec30b0e6a61d20a5accabecac6b1949
 +F Makefile.in bd57b03256fce1d968c432166e063232fa2659963ecd45f1cc2ff77b8aec850d
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 -F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
 +F Makefile.msc fccc0062959ce30dde9fa79c88e77939637fd43706b9f3dd4f68065b5594e9b5
  F README.md 2dd87a5c1d108b224921f3dd47dea567973f706e1f6959386282a626f459a70c
- F VERSION b09048f5104cef7fbc4405635ec966be2481d532c0dbd46afd5c17f957de2dc0
+ F VERSION 01b4df68a6266aba3e9ddaee2431393b03fd9c7f9a1f972640618f91bb743a4c
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -554,15 -553,15 +554,15 @@@ F src/random.c 097dc8b31b8fba5a9aca1697
  F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c ba0cd3d264fa788c8d65f063d5ec3e1d65b0dac206c822a564a59ba550210cfc
- F src/shell.c.in 76fcf2bac2cd1868f51a95e53a8ce748efce411c7a38ee5c482ef442062e2be9
 -F src/shell.c.in 1060fa0c4d585fb40f3473d7175c05ea81b0909a304de7216ae7b97bf0e5845f
 -F src/sqlite.h.in b93deee892f1bc4030e5c8712df9e21d786a1bf8e921ab8dc987eaf1e44c676f
++F src/shell.c.in 0f9f34114d7d3318961f6c195a7d7cf16249573cbf3b8f9d67552362e9cb206e
 +F src/sqlite.h.in c8f93ce5a0153484bd176d67d6d23deec48076fb7d45d1752411a6e1ed92fc6f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
 -F src/sqliteInt.h 272c5ca0a16a1963c0c956524c615a27af57be950b97a395d39cb9fd9b31fc4e
 +F src/sqliteInt.h f249dead228fcfa65e3a5848180bb3010bbd780433373ef17e2cc37bf6a21311
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
 +F src/tclsqlite.c d438eb0f0d345f5cfccc6d00232677082bb9cf1dfd2422f7d7891fae58516260
  F src/test1.c 87fda59eea3ac1eba1baef37c1967565cb1b8d6d264649f2e57f252ca5989914
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -625,13 -623,13 +625,13 @@@ F src/update.c f875b0d59da5c3055a0b2ac2
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
 -F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
 -F src/vdbe.c dafb1c9c2f58555bf6f384fe049a4b4fc2408b500216b37769f8faa82a46e57a
 -F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 +F src/vacuum.c 97424abbd3b5831d0142349a3c2dad52c364e39fab67f7e0f5c60d2694463940
- F src/vdbe.c f8509ed4037ca44f060010111688b9d36611876970eb285831571cd46fdb5078
++F src/vdbe.c 35c770dece590b9aac00629591d3532ce87749ee79e3897fffee2572131a189e
 +F src/vdbe.h bfde0b0f429a0ba4203e5319780a6a1c8b2a809c5cd6baa9ae22e257a657b8b3
  F src/vdbeInt.h b45599a2b59f1ce042512ab6786b0b82a8cf3002f6b0fa60b4834e2cd3ac61d8
  F src/vdbeapi.c 8863ffb5a7bac42fe9a68aaa3526ee29fc18fb02a9b27188b756de41e33856e9
 -F src/vdbeaux.c 0d7659fe8cb38ce86092b9bc5131c99a834a04eb78745e54acb77d79d7af2fb5
 -F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 +F src/vdbeaux.c 3a86053ed0f9ffbbbab8562d9d67657f64223d5e5ef9b23f82d76c9b5c0a4ceb
 +F src/vdbeblob.c aa23a326ff86bdde8f7ba74cf23c3e1795b13bee749314feaf26273be2f63e89
  F src/vdbemem.c 2db321ed3722f78c7f1e6743ff24ae68717fcc44c157817ae7eaf0a83439af98
  F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@@ -1954,8 -1944,10 +1954,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 07fc5c6eff89419ea9b8d741ea33ac853fa83bab3d78f62f652de47875c623d5 9547e2c38a1c6f751a77d4d796894dec4dc5d8f5d79b1cd39e1ffc50df7b3be4
- R 625378f486497f1800140ec05bd9db56
 -P 4f83c442c9b34abc292566b9547d3bd265e7a5e9662472fd6498faa22aafdd24
 -R cfa691fad1c1b13c897954002fcae77c
 -T +sym-release *
 -T +sym-version-3.38.4 *
++P 436d0a5837a750bfb66493de6efd0a9a5d8e8b66cedab433414a1f48921f2857 d402f49871152670a62f4f28cacb15d814f2c1644e9347ad7d258e562978e45e
++R 62893602e22d0107b7b8838c04f943aa
  U drh
- Z 78456570900b6bab17b3bbde5501db5e
 -Z 5aa4cf8764f337c9398ac713b67bacc1
++Z 21d065abf46c643a8c85de88ab9b42fa
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 18877ae0d855d36032df717b3d6dc2c81d55926a,1f08204e4bcb2016a6d6c9a4b78ce068f5cd00f0..71bcf9a5cdb4c33ec979251c2124f190f7388783
@@@ -1,1 -1,1 +1,1 @@@
- 436d0a5837a750bfb66493de6efd0a9a5d8e8b66cedab433414a1f48921f2857
 -d402f49871152670a62f4f28cacb15d814f2c1644e9347ad7d258e562978e45e
++d5b0fd8434f893db444eb62e254871d92a593c3c4871641b0392453444444e15
diff --cc src/shell.c.in
Simple merge
diff --cc src/vdbe.c
Simple merge