]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the 3.35.0 release into the begin-concurrent-pnu-wal2 branch.
authordrh <>
Fri, 12 Mar 2021 17:18:13 +0000 (17:18 +0000)
committerdrh <>
Fri, 12 Mar 2021 17:18:13 +0000 (17:18 +0000)
FossilOrigin-Name: 939b9e75307de5067a11351dd4010046a5400e8126c5c2bafea4fbea97e00f86

1  2 
ext/session/sqlite3session.h
manifest
manifest.uuid

Simple merge
diff --cc manifest
index 4d02f45688d4cd595ef17cbda9aa127f3fa83591,ffe476cb80649d67ba869f616be02b0c3ee1e7fd..138f947262bf8125f036a3e96095cdcff17071f8
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\swal2\schanges\sinto\sthis\sbranch.
- D 2021-03-11T20:07:07.989
 -C Merge\sthe\s3.35.0\srelease\sinto\sthe\swal2\sbranch.
 -D 2021-03-12T17:08:43.311
++C Merge\sthe\s3.35.0\srelease\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2021-03-12T17:18:13.264
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -460,11 -457,9 +460,11 @@@ F ext/session/sessionnoop.test a9366a36
  F ext/session/sessionrebase.test ccfa716b23bd1d3b03217ee58cfd90c78d4b99f53e6a9a2f05e82363b9142810
  F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c2666091b54450a68fb5
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
 -F ext/session/sqlite3session.c a7c5ac1acfe21d94b37921b29b0458d64d022a66b282338eee4aafa9c018cb1c
 -F ext/session/sqlite3session.h f48662626e7a3176a188787a0bd360933dd46cccd98df01c208b02051c540fb7
 -F ext/session/test_session.c 90ccf1c30c857bd2fb3f6c990163e8f389ddbdbdc7fa5baa2f6f5f287df41c08
 +F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
 +F ext/session/sqlite3session.c 5eb3a3cb490912376c5720d24eb256753e4a29a2a62f39ac708a084d854b4fea
- F ext/session/sqlite3session.h e06f2bd77d2a2fc00a926c39ac47d639f7f1e36e1eba56862d010aaf37119e68
++F ext/session/sqlite3session.h cae11f96e40915220076acf4d7b3e4eb26f817d92064bd5983d47f9fe7f31ec6
 +F ext/session/test_session.c 18372dfe254a219705f89bc95c5ef26744236c4dbac5cdfbe71959290afc928d
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
@@@ -543,18 -538,18 +543,18 @@@ F src/pcache.c 385ff064bca69789d199a98e
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
  F src/pragma.c 4577091a839722cd74e5492f10dc238a93751f4bcc0c8c9ee572d7592f3936be
 -F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 +F src/pragma.h b93fd693bd38cefeaf8e2c7e8c929717f7799a9770104cdd2bae8df2a84e2da7
  F src/prepare.c e21b54489b5c73b06ada15e6fc79b5c6f64b06701924a6ca98944ae59e06256f
  F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 -F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 +F src/random.c f27af4099afaea7284ade5c206224dcfdb2334cfd119d018b470d46356b3f27d
  F src/resolve.c d95db73d3e6a5c689e5f6604b4d2521350e45f2a0f0f84f5a2dc2bfee56580a0
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c fc904a7aa7ebfd5c7a57a0141d829c9f5388ac7773e0d1d9668768c1bbc87fc3
 +F src/select.c bfcf53e991ee5852790f87f5fd699ac812e7dde64c1f81cb511fdc3be48ab3e8
- F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
+ F src/shell.c.in 35adf1212d759069b00e468a9304a05a67710c8f8f50e7312335e23cac985d8c
 -F src/sqlite.h.in 3426a080ea1f222a73e3bd91e7eacbd30570a0117c03d42c6dde606f33e5e318
 +F src/sqlite.h.in 71ba363afc97d615d43ab4d1c6992036e82efb799852fe96106b79c94bb87f7f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
 -F src/sqliteInt.h 3652edb9e6032808d51d6f26d9c6f9eb621ac199e0fd2d2a5aa551799d91a296
 +F src/sqliteInt.h 9a3af475395d300d7eb00c2553a372086c10064d4a1b68a55cccfec0df762622
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1941,7 -1922,7 +1941,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 b0fc8ca14ec8ed3a42bf647b112d5fba640f2adc948485da795fc802b74b3106 30f912d0b39ff6fcf9a555affb5990c4bce8726fbd27062cd0c95851724f91d4
- R 8cedaa4b31f97146b6754e72ff9d018b
- U dan
- Z af12c854ae0c3222b4bfe6b609ea4886
 -P 30f912d0b39ff6fcf9a555affb5990c4bce8726fbd27062cd0c95851724f91d4 acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
 -R da5b233d420dc6ba22196b791954b6f4
++P 88c3c173e04cb01a07a323242872f5d1472d45c726a90ea90386b08e9fd82f57 03142e5f760ef46c7837fef1b21f54baf64f4b9d99d1c9e3f4d8d6c8d1ab875f
++R dfb01d2cb04dda70c9dec088fec23ac6
+ U drh
 -Z b4aa7d1d2e4b55e0318e2e83d31c0dde
++Z 56fe82a8a286441bede105b621763ab0
diff --cc manifest.uuid
index b59b2f5ceb629e75ca9810a7f819468c3e9eb6d4,4da1aed156d9068422ee87b5e52cde9a95aaed1f..546b63a1c47fd13e33867bb6e86f899eddab3a52
@@@ -1,1 -1,1 +1,1 @@@
- 88c3c173e04cb01a07a323242872f5d1472d45c726a90ea90386b08e9fd82f57
 -03142e5f760ef46c7837fef1b21f54baf64f4b9d99d1c9e3f4d8d6c8d1ab875f
++939b9e75307de5067a11351dd4010046a5400e8126c5c2bafea4fbea97e00f86