From: dan <dan@noemail.net>
Date: Thu, 2 May 2013 17:37:31 +0000 (+0000)
Subject: Minor fixes for compilation with SQLITE_OMIT_WAL defined.
X-Git-Tag: version-3.7.17~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32c12fe2bb8e4405db53918204d192760655e51a;p=thirdparty%2Fsqlite.git

Minor fixes for compilation with SQLITE_OMIT_WAL defined.

FossilOrigin-Name: b81e87e72b976e7157a53a50abc5422e2a6c4c39
---

diff --git a/manifest b/manifest
index a5bd0b436b..3146caf6a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\suse\sa\stransitive\sconstraint\sto\san\sIN\soperator\swhere\sthe\sRHS\sis\sa\nconstant\sif\sthere\sexists\sa\sdirect\s==\soperator\sto\sanother\stable\sin\san\souter\nloop.
-D 2013-05-01T17:58:35.871
+C Minor\sfixes\sfor\scompilation\swith\sSQLITE_OMIT_WAL\sdefined.
+D 2013-05-02T17:37:31.421
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -175,9 +175,9 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c 5a214c5431fd005dbb3b8bbaaa306433e8e9b48f
+F src/os_unix.c 658b180a09a18214d94547f737dbded71667cdab
 F src/os_win.c 673b3e3d1fa3040d8d95a7f1f5e0e553aed56cfb
-F src/pager.c 4a9160d268977e56ae2df90182050ab30fca715d
+F src/pager.c 49e23f9898113ddfe90942bdf1c1ef57955d0921
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 9708365594eea519cdc8504dee425c0a41c79502
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -261,7 +261,7 @@ F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f
 F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c
 F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
-F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
+F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
 F src/where.c 12d4200eb6ae991cad02367c391db076ac1af1b0
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1060,7 +1060,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 329478cbed06f93652de50abdb31a6b41af02b9e
-R cc457983507eee39e1b071292dee5b26
-U drh
-Z 944723cfd5dfa8d16765eaab2fd82886
+P faedaeace9c7ed9a8aaf96700caee09db0c0c061
+R 0cb8383fe74822aeab35f5d514cbdea3
+U dan
+Z 177e5be29875bd46bd8a77f94ee092d8
diff --git a/manifest.uuid b/manifest.uuid
index f88e8ae7a8..253732acb3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-faedaeace9c7ed9a8aaf96700caee09db0c0c061
\ No newline at end of file
+b81e87e72b976e7157a53a50abc5422e2a6c4c39
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 0074412410..6eed674072 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -126,7 +126,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-#ifndef SQLITE_OMIT_WAL
+#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
 #include <sys/mman.h>
 #endif
 
diff --git a/src/pager.c b/src/pager.c
index dffcf602d7..1c6a84fea4 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -2871,10 +2871,13 @@ static int readDbPage(PgHdr *pPg, u32 iFrame){
     return SQLITE_OK;
   }
 
+#ifndef SQLITE_OMIT_WAL
   if( iFrame ){
     /* Try to pull the page from the write-ahead log. */
     rc = sqlite3WalReadFrame(pPager->pWal, iFrame, pgsz, pPg->pData);
-  }else{
+  }else
+#endif
+  {
     i64 iOffset = (pgno-1)*(i64)pPager->pageSize;
     rc = sqlite3OsRead(pPager->fd, pPg->pData, pgsz, iOffset);
     if( rc==SQLITE_IOERR_SHORT_READ ){
diff --git a/src/wal.h b/src/wal.h
index ff7624af63..092546354b 100644
--- a/src/wal.h
+++ b/src/wal.h
@@ -43,6 +43,7 @@
 # define sqlite3WalExclusiveMode(y,z)            0
 # define sqlite3WalHeapMemory(z)                 0
 # define sqlite3WalFramesize(z)                  0
+# define sqlite3WalFindFrame(x,y,z)              0
 #else
 
 #define WAL_SAVEPOINT_NDATA 4