Fix an RBU problem with restarting an update after the *-oal file is already larger...

FossilOrigin-Name: 0e79584a2b822594e2d7582f122ecba13531f1a593a4efa2330c40864b8be884

diff --git a/ext/rbu/sqlite3rbu.c b/ext/rbu/sqlite3rbu.c
index 1a13b6c4ad7d527fe3872ed393143ae39358c87c..a0ecc558eac63ec7e4825821b0a985a8257b7bf7 100644 (file)
--- a/ext/rbu/sqlite3rbu.c
+++ b/ext/rbu/sqlite3rbu.c
@@ -2727,7 +2727,7 @@ static RbuState *rbuLoadState(sqlite3rbu *p){
         break;
 
       case RBU_STATE_OALSZ:
-        pRet->iOalSz = (u32)sqlite3_column_int64(pStmt, 1);
+        pRet->iOalSz = sqlite3_column_int64(pStmt, 1);
         break;
 
       case RBU_STATE_PHASEONESTEP:

diff --git a/manifest b/manifest
index 1ce1c005662e4b9a06c3360861fd2f63aa477827..942a2d82b67783e73e831b73e2c8f4bebfc7d434 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sversion\s3.36.0
-D 2021-06-18T19:01:15.358
+C Fix\san\sRBU\sproblem\swith\srestarting\san\supdate\safter\sthe\s*-oal\sfile\sis\salready\slarger\sthan\s4GiB.
+D 2021-10-26T10:16:17.186
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -380,7 +380,7 @@ F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697
 F ext/rbu/rbuvacuum2.test b8e5b51dc8b2c0153373d024c0936be3f66f9234acbd6d0baab0869d56b14e6b
 F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc
 F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10
-F ext/rbu/sqlite3rbu.c badb52388467f58e67ef104c5276d1ac68b316a30f8ccb2f74eac733625ae236
+F ext/rbu/sqlite3rbu.c 6141b8068ba2dbef1e42e6fba69322b61add8ed6bdd810c4fd9d59e09852ba6d
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -1928,7 +1928,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 92d8f967c9a7e4005c63703af8075b3d2ae5aa43c6b5bc6e599735dc4479bef6 5c9a6c06871cb9fe42814af9c039eb6da5427a6ec28f187af7ebfb62eafa66e5
-R 36eb132f78c5514148fa4679afcdeeb6
+P 792215204d887ecb8b1a0d65773d272b84606c9867b52d94701039de5c8bb12c
+Q +56869f54f31186231a4467f10208bcc08d9edae23c6e21831d6d3dff47da51de
+R 872e4b94293046bb5438e7587fecb54b
+T *branch * reuse-schema-3.36
+T *sym-reuse-schema-3.36 *
+T -sym-reuse-schema *
 U drh
-Z e12fbca0ecb8c5a30c8e5b0bded987be
+Z f12a570fc3bf139c8d528d3c420510af

diff --git a/manifest.uuid b/manifest.uuid
index 13585008a291be6923eb381d9f6088aa30895822..b67422234ba9a887572bc505b25361d3c506d0c5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-792215204d887ecb8b1a0d65773d272b84606c9867b52d94701039de5c8bb12c
\ No newline at end of file
+0e79584a2b822594e2d7582f122ecba13531f1a593a4efa2330c40864b8be884
\ No newline at end of file