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

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

FossilOrigin-Name: 27f8f56b98275fcd054b7f7477e0c99711b7a249b8df62647214a711c94bdb48
---

e0905aa4016280fe820c661304a27a6d09376bad
diff --cc manifest
index eda2d3d333,025cc90830..5d471be0b0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\schanges\sfrom\sbegin-concurrent-pnu\sinto\sthis\sbranch.
- D 2021-03-11T19:26:42.089
 -C Merge\sthe\s3.35.0\srelease\sinto\sthe\sbegin-concurrent-pnu\sbranch.
 -D 2021-03-12T16:24:43.737
++C Merge\sthe\s3.35.0\srelease\sinto\sthe\sbegin-concurrent-report\sbranch.
++D 2021-03-12T16:50:27.292
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -549,11 -548,11 +549,11 @@@ F src/random.c f27af4099afaea7284ade5c2
  F src/resolve.c d95db73d3e6a5c689e5f6604b4d2521350e45f2a0f0f84f5a2dc2bfee56580a0
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c bfcf53e991ee5852790f87f5fd699ac812e7dde64c1f81cb511fdc3be48ab3e8
- F src/shell.c.in af18a2e980aabe739a8188266464866fe7947b100674e07480e7ba3e37595947
+ F src/shell.c.in 35adf1212d759069b00e468a9304a05a67710c8f8f50e7312335e23cac985d8c
 -F src/sqlite.h.in 71ba363afc97d615d43ab4d1c6992036e82efb799852fe96106b79c94bb87f7f
 +F src/sqlite.h.in 87051ea1e024186354ace08b93824a0baeeecfbc3733a40435d5c0518ee556be
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
 -F src/sqliteInt.h e8cad670ae52a0781446f6d4c5415d587a5ab3e99f1a65fc3a95a377d4ce6e79
 +F src/sqliteInt.h f4d7a66d97c54f9181cbad8708d9df58b8b44034ab4c0e8b707f9977877c9b71
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@@ -1928,7 -1926,7 +1928,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 d2de81a24f82d71d5ec41e8eada860cacdefc659cdee61b224e13e80b7783c62 eb3101364faabb49d180f74c795e4f1430541937fd19ce95205618c98324c797
- R 775bb11045d76b5b5cc2218a81bde2cd
- U dan
- Z 0fcfc6a6027bd72c8e8d0247efd95ecc
 -P eb3101364faabb49d180f74c795e4f1430541937fd19ce95205618c98324c797 acd63062eb06748bfe9e4886639e4f2b54ea6a496a83f10716abbaba4115500b
 -R 46b5d2b278eb22de529c3cbdfce0299f
++P 6994a2d8af30e5f5a9ce7735c3d1b2b66c1adc8f6fff37c894e2b827fe714f91 a0a9dd52a7b514a8b919d67650178c76167cdbb6e23523222c3df709953b0f25
++R 833e7b39ea5cc3f1ca70206feb2a2476
+ U drh
 -Z a86191c1d05a5db171c6db5bd20b4db1
++Z 31aaf41642239025ded1c2795723dbe1
diff --cc manifest.uuid
index 9c17b3866c,86bcdbed9a..1fba5245fe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6994a2d8af30e5f5a9ce7735c3d1b2b66c1adc8f6fff37c894e2b827fe714f91
 -a0a9dd52a7b514a8b919d67650178c76167cdbb6e23523222c3df709953b0f25
++27f8f56b98275fcd054b7f7477e0c99711b7a249b8df62647214a711c94bdb48