Merge changes from branch-3.35. Specifically, fixes for a running RBU with a cksumvfs...

FossilOrigin-Name: ca62c36b7f45369679cdc7acfcce108f897d5f7a2ac74bd603b45a024fe5e5bc

diff --cc manifest
index 310fc024fba8f80d7bbf6425cd4ebbaa98452b48,841f5d36937c8becef1a0622a034c44327eb0ad6..23db36fed9285e3235338a1275c6c8b8029b5cb3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sin\sthe\s3.35.5\spatches.
- D 2021-04-19T19:07:16.720
 -C Fixes\sfor\scksmvfs\sand\srbu\sso\sthat\sthey\swork\stogether.
 -D 2021-05-11T11:25:06.733
++C Merge\schanges\sfrom\sbranch-3.35.\sSpecifically,\sfixes\sfor\sa\srunning\sRBU\swith\sa\scksumvfs\sVFS.
++D 2021-05-11T11:33:44.444
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -544,15 -543,15 +544,15 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c fec151c9c33a6fa2e93d10b4e8cd4084a7c773df36fb3ec6788eb89ae493a1a4
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a
 -F src/shell.c.in aa28256887d049badaf93aa30ab5c76a2ec88143a674d685c0e739056702e5c3
 -F src/sqlite.h.in b249208f9542a6f0bc033455acde8c7dc9711f19ed7f8d907e5cabd3200884bf
 +F src/shell.c.in 8f658734fb8b7205c20f6b0bf7d02886887df60000d261f0c0b478511f4b6cd7
- F src/sqlite.h.in 0144aeddd6f44ffddfcf965f6dd3983865830d2db3fe73a856874b28cd40765e
++F src/sqlite.h.in 4cb58c05f4483125c961d39989c63448ff34b9460abb9bf8f07234028b851887
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
 -F src/sqliteInt.h e56aa05ef78513cd596c30a56fda68cd9bba91d444ac40e135e919fed40cd875
 +F src/sqliteInt.h 5cbcb97dd2a283121c59756904a912ab7f484f1755f101936f287ba3f4a45599
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
 +F src/tclsqlite.c f4dd32d001c2be33371dca87e30117352f02dad59a2e5428c97f08703360a169
  F src/test1.c cff43d8e21be543b77651b4d2caf49bd6488fee220f8540ecd9f71d13169dbd1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1920,10 -1910,8 +1920,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 4b4f87913ad27653392646a6900afb508f90fd9f463a85e08195fe1da99964ef 1b256d97b553a9611efca188a3d995a2fff712759044ba480f9a0c9e98fae886
- R fbdc34352e3563c3d1b7b18ba0ca33b2
- T *branch * reuse-schema-3.35
- T *sym-reuse-schema-3.35 *
- T -sym-reuse-schema *
- U drh
- Z 65bbd438097b1ae86015ad9fa774a2e2
 -P 1b256d97b553a9611efca188a3d995a2fff712759044ba480f9a0c9e98fae886
 -Q +f35f6972cdcf16915cc37908b65a3780742a1f75f65e974714b16e86f0c9e3f0
 -R 16a913cadfff0fe3628f115850e3f079
++P 35d1c9a5f846a513a42a0cc9240c3e9a8f3073fa16c88e70b3b9357d8d5adee8 ce8b589e4c7b14ae5f84d47da91931bae109f027490f4b23e0837fde3b037127
++R 54da8ddc61748361e968710a82a15126
+ U dan
 -Z 058f117d9c846da5d3c36c21fce509a4
++Z e72237889cab318d06a88e762bfc81d9

diff --cc manifest.uuid
index 2355b77d08456f8024053e252207db493cb8af1a,7b423b5470d8c64c855f9c4a67134c5894472778..6bf3a54182fcf6a959d8904209cc2fcddbad77d2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35d1c9a5f846a513a42a0cc9240c3e9a8f3073fa16c88e70b3b9357d8d5adee8
 -ce8b589e4c7b14ae5f84d47da91931bae109f027490f4b23e0837fde3b037127
++ca62c36b7f45369679cdc7acfcce108f897d5f7a2ac74bd603b45a024fe5e5bc

diff --cc src/sqlite.h.in
Simple merge