From: drh <>
Date: Fri, 12 Mar 2021 16:24:43 +0000 (+0000)
Subject: Merge the 3.35.0 release into the begin-concurrent-pnu branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05c344639670f997e6efde32fddabde06d8a8067;p=thirdparty%2Fsqlite.git

Merge the 3.35.0 release into the begin-concurrent-pnu branch.

FossilOrigin-Name: a0a9dd52a7b514a8b919d67650178c76167cdbb6e23523222c3df709953b0f25
---

05c344639670f997e6efde32fddabde06d8a8067
diff --cc manifest
index 73c767856a,3a658ff085..025cc90830
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2021-03-11T19:08:44.266
 -C Version\s3.35.0
 -D 2021-03-12T15:10:09.783
++C Merge\sthe\s3.35.0\srelease\sinto\sthe\sbegin-concurrent-pnu\sbranch.
++D 2021-03-12T16:24:43.737
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -458,11 -455,9 +458,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 23c5bcbd3f67e8056b8a95d6248a289c4c9299b000e4caeac9b7074f8c32a867
++F ext/session/sqlite3session.h 5fde30dfa4050a817d158a923bf47647ae2701df745144e9cfb75a1af7565511
 +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
@@@ -541,18 -536,18 +541,18 @@@ F src/pcache.c 385ff064bca69789d199a98e
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
  F src/pragma.c eb42cb9bec189cf18cef5d8fcae56e13bb73ef2b019b198fb48740ced81bce95
 -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 e8cad670ae52a0781446f6d4c5415d587a5ab3e99f1a65fc3a95a377d4ce6e79
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1926,7 -1910,10 +1926,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 59d3ec295a6e640886cdccd49bd4522af29b37220fb9c99e8e39552ea2cbcdcb 07150cf15ad36c7fc681a911f66db23d610ddf110a7be7f1fcefbd8750cd135a
- R a034d123a39f1f532ccc1f2bb318970c
- U dan
- Z 64a83f4dd6669919ea7a3c9b1a5b2648
 -P 98d67152849e062c6de45b0e526daffc3d6cb29d563d40664a8d7140119a30b2
 -R 39a4a0d8e5c6bc44cb1af4a996c13e18
 -T +sym-major-release *
 -T +sym-release *
 -T +sym-version-3.35.0 *
++P eb3101364faabb49d180f74c795e4f1430541937fd19ce95205618c98324c797 acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
++R 46b5d2b278eb22de529c3cbdfce0299f
+ U drh
 -Z 57dbd644ae30193b3f75279561c2eade
++Z a86191c1d05a5db171c6db5bd20b4db1
diff --cc manifest.uuid
index 9ef014584d,6f063d70d6..86bcdbed9a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- eb3101364faabb49d180f74c795e4f1430541937fd19ce95205618c98324c797
 -acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
++a0a9dd52a7b514a8b919d67650178c76167cdbb6e23523222c3df709953b0f25