From: dan <dan@noemail.net>
Date: Thu, 5 Oct 2017 20:02:49 +0000 (+0000)
Subject: Fix a problem building with SQLITE_OMIT_WAL defined.
X-Git-Tag: version-3.21.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f54e2b5d3fa522dd66666d28843e74e80788875;p=thirdparty%2Fsqlite.git

Fix a problem building with SQLITE_OMIT_WAL defined.

FossilOrigin-Name: 373b0ace480aa303bbf512ea8806a17f6186b16d6316a7b724499bf94b3974d4
---

diff --git a/manifest b/manifest
index c8dcd3d77f..94c993303c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\scommand-line\sshell\sso\sthat\sthe\s".schema\s--indent"\scommand\sdoes\sa\sbetter\njob\sof\sdealing\swith\s\\r\\n\sin\sthe\smiddle\sof\sa\sCREATE\sstatement\sin\sthe\sschema.
-D 2017-10-05T19:12:10.083
+C Fix\sa\sproblem\sbuilding\swith\sSQLITE_OMIT_WAL\sdefined.
+D 2017-10-05T20:02:49.526
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -445,7 +445,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 3984fc069df59e26f000e30609611cecdb4e93293e6ee52313a473a7e874af1b
 F src/os_win.c 6892c3ff23b7886577e47f13d827ca220c0831bae3ce00eea8c258352692f8c6
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 2aa56a99bb13128d9102e84c7a9f835e546cbb58f0861d481bc3db32973b1628
+F src/pager.c 62f88892d3a2c68cff6e8f96c81c5dfe5178eace887880c36364aabe4d8d6422
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
 F src/parse.y 52ef3cecd0934e9da4a45b585883a03243ad615d338ad94f44501a05891dcdfa
 F src/pcache.c 4bada070456980c3c1f16d58ec2e64e389ad77b935e3d77e0c96e7bbd397289c
@@ -1655,7 +1655,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 d22c99b6ba997179ef3ccd341d9c36d5213d699305d15942d82587a0bfd16f9d
-R 275813642399adb31ada00e2bf9958bd
-U drh
-Z f0605b7334559ebfe51c1e99fb005c13
+P 4258fb578a6e75590c7314fe511ca8dc6659e5f2d3a54d8f60ff705fe51ccc92
+R fba1f72a529b91d37df6bb92e25ac897
+U dan
+Z 4d1d6f0cdfff4b56d945b83bdce453fb
diff --git a/manifest.uuid b/manifest.uuid
index bfe1bbba34..d29e532767 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4258fb578a6e75590c7314fe511ca8dc6659e5f2d3a54d8f60ff705fe51ccc92
\ No newline at end of file
+373b0ace480aa303bbf512ea8806a17f6186b16d6316a7b724499bf94b3974d4
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index a43614cdb4..2ddca9a5f7 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -3012,6 +3012,8 @@ end_playback:
 static int readDbPage(PgHdr *pPg){
   Pager *pPager = pPg->pPager; /* Pager object associated with page pPg */
   int rc = SQLITE_OK;          /* Return code */
+
+#ifndef SQLITE_OMIT_WAL
   u32 iFrame = 0;              /* Frame of WAL containing pgno */
 
   assert( pPager->eState>=PAGER_READER && !MEMDB );
@@ -3023,7 +3025,9 @@ static int readDbPage(PgHdr *pPg){
   }
   if( iFrame ){
     rc = sqlite3WalReadFrame(pPager->pWal, iFrame,pPager->pageSize,pPg->pData);
-  }else{
+  }else
+#endif
+  {
     i64 iOffset = (pPg->pgno-1)*(i64)pPager->pageSize;
     rc = sqlite3OsRead(pPager->fd, pPg->pData, pPager->pageSize, iOffset);
     if( rc==SQLITE_IOERR_SHORT_READ ){