]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge version 3.37.0 into the begin-concurrent-report branch.
authordrh <>
Sat, 27 Nov 2021 14:56:45 +0000 (14:56 +0000)
committerdrh <>
Sat, 27 Nov 2021 14:56:45 +0000 (14:56 +0000)
FossilOrigin-Name: 126d7a1d88c6d383b158a20d996a9f3b416b477554e36e1b72d43add4c35b523

1  2 
manifest
manifest.uuid
src/sqliteInt.h

diff --cc manifest
index 2dd23a0a9cd799377fafdc53fc2398cbd8b111e0,7eb29a221e9e9238e3a3053b114867784703d09b..43345f8702339789d98401b6686c0640bf46c9df
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent-report\sbranch.
- D 2021-11-22T16:39:01.387
 -C Merge\sversion\s3.37.0\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-11-27T14:48:36.971
++C Merge\sversion\s3.37.0\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2021-11-27T14:56:45.231
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -494,13 -493,13 +494,13 @@@ F src/alter.c 23743384e59f9d36df870ce41
  F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
  F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 -F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 3907fcbe8a0c8c2db58d97087d15cdabbf2842adb9125df9ab9ff87d3db16775
 +F src/backup.c 0d3f5004d5c85f257add00aee97687d40790a471a5d56306043ed9a7b53d6994
 +F src/bitvec.c e67e4ebed581b5f0aa9155abd88177ed8b63eb40e9266b1483ce7f6eb9257477
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 83f2ea858ad99c050030a207390c953337912ab9c5649ff18283c3c6224702d6
 -F src/btree.h 900067641b64d619e6e2a93bd115c952a52f41d3bee32e551e2a4ceee05fc431
 -F src/btreeInt.h 3f19f0be5af0b68cff55e58df4b11e7a0692d9e8a820ceaeba4084659a86cf28
 +F src/btree.c 0bd2611eaacd026cd3634735ccee7847a1f21ff8a966cbc53314570d16ea5d9d
 +F src/btree.h 1c1508834794c0d15fe15d23792cd42deefd8140ad782899eab258d081a0adfc
 +F src/btreeInt.h 614e75ff0bfdd26f4270ba178cd5a41f904aee7be203612fbe7fc2215fc83d9c
- F src/build.c ee4b4aefda097c1220ae5ce615bdfbb05ed50d3015e72c5af335fb66fc08af37
+ F src/build.c fba6792e5d9852620e6a6df4229dc3ffbe9c6a2340e858c70605385d1d083232
  F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
@@@ -556,18 -555,18 +556,18 @@@ F src/printf.c 5901672228f305f7d493cbc4
  F src/random.c c6e61d041f230d46c658e6dfe7165fc1ecb0093d5fe28cfe74f389d261dc3af8
  F src/resolve.c 4a1db4aadd802683db40ca2dbbb268187bd195f10cbdb7206dbd8ac988795571
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 9e70ca5f5836527faaf62f8cce5429f9096ad593606be297eaabcb4c4f0ef057
+ F src/select.c 7e8082835f8b8891a0785dc163724a13b5c200abd0931fd3204b2578339c49bc
  F src/shell.c.in 975f268ef261773fcbed1e519dfa10c4f33e8b1cffc12120563e61857fff07c6
 -F src/sqlite.h.in 32f7d112cb85d3f2fd56500e11a6bd6d19a969306650200dcde97c2638cfecfc
 +F src/sqlite.h.in 5c7c193579e84dde8b0f2a9842170e7ecc74ecadfd26503a66873edacbb5114c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8ff2fd2c166150b2e48639f5e506fb44e29f1a3f65031710b9e89d1c126ac839
- F src/sqliteInt.h 2def09c82b66ab93cbdcb0828a23bc689a8e36128c36adc5c67c06f49e21a49b
 -F src/sqliteInt.h 43d34bba92cfbf88794b8da251b9ae94945fcaa8181cb389f09fdfd969c5da25
++F src/sqliteInt.h 3dc82c792a086e73473e6cb8b04f3add44abb0bdb9d2a6ee81542497cb18613c
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 50c2b759f4a918e41ed7a038baaef087ff264c7b3adddf39741315a53fd92e47
+ F src/tclsqlite.c 48f291e1a7e672a7204884d4c164a8ed3a522ff087c361ada2991f5d54e987f6
 -F src/test1.c 2785b6fd05e4810f7215bf8de01c15670f39a19e49e3d927045f5e72ab08b4cd
 -F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 +F src/test1.c 1ab25d4bd0133cd4d6a182118dad8bb3fa5724c23596216febb370c164e8ec23
 +F src/test2.c cb988be1ee1b972dc471e6b076087cfa9cb9ce5c2aa31e98ecf41c3256a72a53
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -1951,7 -1949,7 +1951,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 122f4a762ab1812f423e57c0630602de48ebf58bc0ff166bd08822dbdd15c5e2 aa045e7b09ee47fb281579178add904fffc2299b05cfc67cf872ec3caaffd69b
- R fd3ba16a77989d9fd4ae507bdf4b1b1e
 -P aa045e7b09ee47fb281579178add904fffc2299b05cfc67cf872ec3caaffd69b bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
 -R 0b73519482b632519dc5c94ef5f418e1
++P ddc11f55990bf20246732dfe2c7e00cdd9bf7c8ebb2983ed49ca355382b4112d 910001f28368896c3e6f11bb6ced3ec3171dcafefd9e6702106b32f3c451e229
++R bbec6fda733d2401e2bb4db86b90d586
  U drh
- Z 5c5104f29b1dda751bc71bae564f3196
 -Z e542c117dcb222209ab8a2000fd55012
++Z 7fcb061a8a358246bd633c7d0bc415fe
diff --cc manifest.uuid
index a70ec2e56245e8d05a32cd6b04bef5dcb695f12d,ab40bbb21be31cdb871f25bd39782221aa1812fa..984e2391f1edf5110fadb78e0bc5864891db7033
@@@ -1,1 -1,1 +1,1 @@@
- ddc11f55990bf20246732dfe2c7e00cdd9bf7c8ebb2983ed49ca355382b4112d
 -910001f28368896c3e6f11bb6ced3ec3171dcafefd9e6702106b32f3c451e229
++126d7a1d88c6d383b158a20d996a9f3b416b477554e36e1b72d43add4c35b523
diff --cc src/sqliteInt.h
Simple merge