From: dan <dan@noemail.net>
Date: Thu, 13 Feb 2014 18:46:59 +0000 (+0000)
Subject: Avoid passing a flags argument with the internal WAL_SYNC_TRANSACTIONS bit set when... 
X-Git-Tag: version-3.8.4~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5b6ea797ea935d0ae245d8ac29613e9ab7972ea;p=thirdparty%2Fsqlite.git

Avoid passing a flags argument with the internal WAL_SYNC_TRANSACTIONS bit set when calling sqlite3OsSync().

FossilOrigin-Name: e3b79e920c298a39613631d689d1a2f182d00496
---

diff --git a/manifest b/manifest
index 821fec76d7..574e8a65cb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\stclconfig\sfiles\sto\sthe\slatest\sfrom\shttp://core.tcl.tk/tclconfig.
-D 2014-02-13T13:42:43.442
+C Avoid\spassing\sa\sflags\sargument\swith\sthe\sinternal\sWAL_SYNC_TRANSACTIONS\sbit\sset\swhen\scalling\ssqlite3OsSync().
+D 2014-02-13T18:46:59.101
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vdbemem.c 06603e8e9d2f3247b68c6bbe4bd37fb6721b5bda
 F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
-F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
+F src/wal.c d89e386ead8ecfc823b6162b09e1ada0623df37a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
 F src/where.c b0436385f40e86f0f4cc60355cd018bde2c89d4b
@@ -1153,7 +1153,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P cc8f10bcb206c9def69b06f26decf025b8d9119d
-R 5827f3fddcd143de0504e7bdcdecb65f
-U drh
-Z 978280b213079b27efd56c6d39f0432f
+P b81ba7a4bc7e840fce25fc6801957a64f877ff60
+R a59cd87bb88fdc66ea1a7d77759b0c27
+U dan
+Z 4fedb8574b1ff1640e605452066ee2b1
diff --git a/manifest.uuid b/manifest.uuid
index 12ee7ec0ac..8a95093ecf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b81ba7a4bc7e840fce25fc6801957a64f877ff60
\ No newline at end of file
+e3b79e920c298a39613631d689d1a2f182d00496
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index f413920648..c2c3d369c1 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2677,7 +2677,7 @@ static int walWriteToLog(
     iAmt -= iFirstAmt;
     pContent = (void*)(iFirstAmt + (char*)pContent);
     assert( p->syncFlags & (SQLITE_SYNC_NORMAL|SQLITE_SYNC_FULL) );
-    rc = sqlite3OsSync(p->pFd, p->syncFlags);
+    rc = sqlite3OsSync(p->pFd, p->syncFlags & SQLITE_SYNC_MASK);
     if( iAmt==0 || rc ) return rc;
   }
   rc = sqlite3OsWrite(p->pFd, pContent, iAmt, iOffset);