From: drh <drh@noemail.net>
Date: Sat, 4 Apr 2009 14:04:58 +0000 (+0000)
Subject: Clarify the meanings of the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
X-Git-Tag: version-3.6.15~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0d62925793a31b050423e2dbed07a61043b271;p=thirdparty%2Fsqlite.git

Clarify the meanings of the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
passed into the xSync method of the VFS.  Comment changes only - no changes
to code. (CVS 6447)

FossilOrigin-Name: c47aeb37a1c054a8e0444b95e29cb332599af2d8
---

diff --git a/manifest b/manifest
index ab88f0469f..6346f436ca 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sblank\sline\sin\ssqlite.h.in\sthat\swas\spreventing\sthe\nSQLITE_LOCKED_SHAREDCACHE\sconstant\sappears\sin\sthe\sautomatically-generated\ndocumentation.\s\sTicket\s#3775.\s(CVS\s6446)
-D 2009-04-03T12:12:59
+C Clarify\sthe\smeanings\sof\sthe\sSQLITE_SYNC_NORMAL\sand\sSQLITE_SYNC_FULL\sflags\npassed\sinto\sthe\sxSync\smethod\sof\sthe\sVFS.\s\sComment\schanges\sonly\s-\sno\schanges\nto\scode.\s(CVS\s6447)
+D 2009-04-04T14:04:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -157,7 +157,7 @@ F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d
 F src/rowset.c badb9f36b3a2ced9ee9551f4ce730f5fab442791
 F src/select.c 462d9671e91accd983110fa38674be0d2a3daa66
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
-F src/sqlite.h.in e39e102cca2d424abedf7f7167e00f2bf45c9a72
+F src/sqlite.h.in 59905c98fd40b3eb3c9a939a113858c75009b7b6
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h 22114af78e17ab06b4ccd3b3f7db8ab14b5f2bb9
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c26f97bd857f3ddb15e63216cdd4a00e06d8eac8
-R 56a9d70583d5d4966554e9a645888a21
+P 65f9d3b948cd6ed4728ab49833b9f2fca96563a2
+R aa0c0c747dd6d50096255d1203d3fb59
 U drh
-Z 74e1dc3b1864c3f9e7c6567bdb1903ac
+Z 45ed7fb71b5c5e1381094e61ad851d68
diff --git a/manifest.uuid b/manifest.uuid
index 314ffd90a3..fc69e4f25d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65f9d3b948cd6ed4728ab49833b9f2fca96563a2
\ No newline at end of file
+c47aeb37a1c054a8e0444b95e29cb332599af2d8
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index c34fbde80a..d20448abe7 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.438 2009/04/03 12:12:59 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.439 2009/04/04 14:04:58 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -461,8 +461,9 @@ int sqlite3_exec(
 **
 ** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
 ** sync operation only needs to flush data to mass storage.  Inode
-** information need not be flushed. The SQLITE_SYNC_NORMAL flag means
-** to use normal fsync() semantics. The SQLITE_SYNC_FULL flag means
+** information need not be flushed. If the lower four bits of the flag
+** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
+** If the lower four bits equal SQLITE_SYNC_FULL, that means
 ** to use Mac OS X style fullsync instead of fsync().
 */
 #define SQLITE_SYNC_NORMAL        0x00002