From: dan <Dan Kennedy>
Date: Tue, 14 Jun 2022 21:34:13 +0000 (+0000)
Subject: Add missing SQLITE_FCNTL_SIZE_HINT call to a path taken during transaction rollback.
X-Git-Tag: version-3.39.0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbf71138cf5fb3e7d7cbf82c9d50ee2f26b2db05;p=thirdparty%2Fsqlite.git

Add missing SQLITE_FCNTL_SIZE_HINT call to a path taken during transaction rollback.

FossilOrigin-Name: 6c3266c1b4fc446c7c3a40a8816caf4f9fe0cafe4f27cdafecac61425a17927e
---

diff --git a/manifest b/manifest
index 0d7cb7378d..ec248f19dd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sremove\sthe\sEP_CanBeNull\sflag\sfrom\sexpressions\sduring\sa\sLEFT\sJOIN\nstrength\sreduction\sif\sthe\squery\salso\scontains\sa\sRIGHT\sJOIN.\sFix\sfor\nthe\sproblem\sidentified\sby\n[forum/forumpost/b40696f50145d21c|forum\spost\sb40696f50145d21c].
-D 2022-06-13T12:42:24.645
+C Add\smissing\sSQLITE_FCNTL_SIZE_HINT\scall\sto\sa\spath\staken\sduring\stransaction\srollback.
+D 2022-06-14T21:34:13.357
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -557,7 +557,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 2df2b33db88f00af13805d4573ee126bc5973f9e3b91d03c575fa7ba64e7dc41
 F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 42120492784fc9bcd9082b5c9b5e329b7318c357f9f3574a1bbfcf7418910356
+F src/pager.c 74596fc3d5d8a50de32c37225fc300cccd5ea27ea303c5f4b845d6572f999c5f
 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
 F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
@@ -1976,8 +1976,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 342c501f532523347e6c339351e02043dd6ee9e11a291224b65ea72bd6c2ba40
-R a249dd322f3d0191f7349eb16a9ed1fc
-U drh
-Z 7bab454819c3e667fed9b310a0634268
+P b1be2259e2e08ec22a88bc9a18b3ab4d83246ad4c635c05cdf80d3eff84df06a
+R 61c4b9fc53ecc0a0dccc78e4998e97a0
+U dan
+Z 592beddfe13fc924a17e7bd0bf00ea44
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a1cda9eb4..8c3276f243 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b1be2259e2e08ec22a88bc9a18b3ab4d83246ad4c635c05cdf80d3eff84df06a
\ No newline at end of file
+6c3266c1b4fc446c7c3a40a8816caf4f9fe0cafe4f27cdafecac61425a17927e
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index b6a0cdfca8..95e6eb8af1 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -2623,6 +2623,7 @@ static int pager_truncate(Pager *pPager, Pgno nPage){
         memset(pTmp, 0, szPage);
         testcase( (newSize-szPage) == currentSize );
         testcase( (newSize-szPage) >  currentSize );
+        sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_SIZE_HINT, &newSize);
         rc = sqlite3OsWrite(pPager->fd, pTmp, szPage, newSize-szPage);
       }
       if( rc==SQLITE_OK ){