From: dan <dan@noemail.net>
Date: Tue, 17 Jul 2018 13:55:08 +0000 (+0000)
Subject: Fix for builds without SQLITE_ENABLE_BATCH_ATOMIC_WRITE.
X-Git-Tag: version-3.25.0~117^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4522c3e8d138ab3c2e4a5bfa91bb8b05464f7673;p=thirdparty%2Fsqlite.git

Fix for builds without SQLITE_ENABLE_BATCH_ATOMIC_WRITE.

FossilOrigin-Name: b10ec14ef7edcc5d7b0ad298c8230d1eca5508e8cf673fbbc97a0928b76c92fb
---

diff --git a/manifest b/manifest
index c6b0b5c82a..6e1a90bd6c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\sfile\sdoc/F2FS.txt,\scontaining\snotes\son\sthe\sway\sSQLite\suses\sthe\sF2FS\satomic\scommit\sfeature.
-D 2018-07-16T20:44:00.735
+C Fix\sfor\sbuilds\swithout\sSQLITE_ENABLE_BATCH_ATOMIC_WRITE.
+D 2018-07-17T13:55:08.594
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -484,7 +484,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c c230a7a24766320d8414afd087edcd43e499fb45e86361f6f4f464f343d965a9
 F src/os_win.c ac29c25cde4cfb4adacc59cdec4aa45698ca0e29164ea127859585ccd9faa354
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 26959078356a658e152de9faf0cd870a36d881e92666c1b80a75938e30a29964
+F src/pager.c 84996f4ff32bd4c556254241106c531473c75880df6fa8e698b921a5ec2bf89a
 F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388
 F src/parse.y 3bd43415ea974b9921b0ff2c0bd3e9100f6e501ede0b6d3b90cca2ab6af25485
 F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
@@ -1749,7 +1749,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1c41250f67ac5de423b0426ef2ab8fe3303278a270225920033933ca9609592a
-R 2220ce8debd68fb6b704ee2986103f77
+P 59efb1bfaba12742379aae45c8c796ca539f089af9e553a3a55d6899a9c583c8
+R f80f88392522b1bdb8d9dd2500fd726f
 U dan
-Z 3478246bf34685cf426f48a9a3e3b106
+Z a92c63bc8962be8f1fcb4cef36d7f989
diff --git a/manifest.uuid b/manifest.uuid
index 9f8867a454..91f656d5df 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59efb1bfaba12742379aae45c8c796ca539f089af9e553a3a55d6899a9c583c8
\ No newline at end of file
+b10ec14ef7edcc5d7b0ad298c8230d1eca5508e8cf673fbbc97a0928b76c92fb
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 7c69271831..bd511227af 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -6499,6 +6499,7 @@ int sqlite3PagerCommitPhaseOne(
       if( rc!=SQLITE_OK ) goto commit_phase_one_exit;
 
       pList = sqlite3PcacheDirtyList(pPager->pPCache);
+#ifdef SQLITE_ENABLE_BATCH_ATOMIC_WRITE
       if( bBatch ){
         rc = sqlite3OsFileControl(fd, SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, 0);
         if( rc==SQLITE_OK ){
@@ -6521,6 +6522,7 @@ int sqlite3PagerCommitPhaseOne(
           sqlite3OsClose(pPager->jfd);
         }
       }
+#endif /* SQLITE_ENABLE_BATCH_ATOMIC_WRITE */
 
       if( bBatch==0 && rc==SQLITE_OK ){
         rc = pager_write_pagelist(pPager, pList);