From: shaneh <shaneh@noemail.net>
Date: Thu, 6 May 2010 19:20:29 +0000 (+0000)
Subject: Changes to support SQLITE_OMIT_WAL.
X-Git-Tag: version-3.7.2~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd0686388150b6aa9dc7300246bc7d3d81bf7312;p=thirdparty%2Fsqlite.git

Changes to support SQLITE_OMIT_WAL.

FossilOrigin-Name: 32a8501d78714cc390eba5f993f329ef3b499878
---

diff --git a/manifest b/manifest
index b74c4ace4b..aba5244e66 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Updates\sto\sthe\sVFS\sSHM\slocking\sdocumentation.
-D 2010-05-06T19:04:49
+C Changes\sto\ssupport\sSQLITE_OMIT_WAL.
+D 2010-05-06T19:20:30
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -157,7 +154,7 @@ F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
 F src/os_unix.c 00403219ceac733ade0b0bb7373146f8e1c18ac1
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
-F src/pager.c d6e9edb629d43a7762882fe2e2950886cdb95606
+F src/pager.c a47af9c2c9ca425bd68642d61764266331a3323f
 F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
@@ -796,7 +793,7 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl 42b6ba8b997a5f5a98f7f1df946c21c173eef586
+F tool/mksqlite3c.tcl aff0d53f0e84cf919922c0d02e767bdf5eeafb90
 F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
@@ -816,14 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P bb0b6021e721c2e4f1533ab18381604c6b7b31d5
-R d0c72074bd58696b6113038e0e7b28ad
-U drh
-Z c235e53e40bb6d632acab8fb73d916da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFL4xLUoxKgR168RlERArJdAJ4wNHIzhO7axMFGGElC9w4cUD5XLgCaA4kj
-o/e8Ei4azqkyRgj0IjRHHs8=
-=O2yN
------END PGP SIGNATURE-----
+P 9927ce421090ac20285cf05768b38e1f91826a68
+R 51a655cb9dc88fa3eb6126dc4d84f844
+U shaneh
+Z 8f927effc2569ea28cd415a1f63e272b
diff --git a/manifest.uuid b/manifest.uuid
index 0b28ffc022..280e8e4765 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9927ce421090ac20285cf05768b38e1f91826a68
\ No newline at end of file
+32a8501d78714cc390eba5f993f329ef3b499878
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 74384197b3..221668c9fb 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -1203,6 +1203,7 @@ static int pagerUseWal(Pager *pPager){
 # define pagerRollbackWal(x) 0
 # define pagerWalFrames(v,w,x,y,z) 0
 # define pagerOpenWalIfPresent(z) SQLITE_OK
+# define pagerOpenSnapshot(z) SQLITE_OK
 #endif
 
 /*
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 686b9dd5f8..da31306963 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -244,8 +244,8 @@ foreach file {
    pcache.c
    pcache1.c
    rowset.c
-   wal.c
    pager.c
+   wal.c
 
    btmutex.c
    btree.c