From: danielk1977 <danielk1977@noemail.net>
Date: Thu, 30 Aug 2007 14:49:58 +0000 (+0000)
Subject: Remove the SYNC_BARRIER flag. (CVS 4337)
X-Git-Tag: version-3.6.10~1840
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c16d463085d7aa5078f41906d6f27ef789fb02f9;p=thirdparty%2Fsqlite.git

Remove the SYNC_BARRIER flag. (CVS 4337)

FossilOrigin-Name: 5a22d8695b49cf7bc2eee382b66a98d29adb9e6e
---

diff --git a/manifest b/manifest
index ceab1a40a5..ab9650c40e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\smalloc3.test\sso\sthat\sit\scan\srun\sin\stransient\sor\spersistent\sfailure\smode.\s(CVS\s4336)
-D 2007-08-30T14:41:34
+C Remove\sthe\sSYNC_BARRIER\sflag.\s(CVS\s4337)
+D 2007-08-30T14:49:58
 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -116,7 +116,7 @@ F src/os_os2.c 8769301bff502de642ad2634cedcb77d967ce199
 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 89bf24aa2475048a7833c45c522e7c6a81b83bb8
+F src/os_unix.c 0f3997dc16c4e83e1d5f4b392c30e1b20f0a77ba
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 3ffd3aacff4cb69848284e29dcec0feff23b0752
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -130,7 +130,7 @@ F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
 F src/select.c e5cc50e8d22b2490c4fb47f2ef08a9b43bcb52d9
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ac29402b538515fa4697282387be9c1205e6e9eb
-F src/sqlite.h.in 4340f2063848977e9eefd534ee13776f5cc9b0f0
+F src/sqlite.h.in b61b40d756363e6e41d5c0a0f5c714e1c05b3287
 F src/sqlite3ext.h 9a26028378c288af500d8b94ed079666fed5806b
 F src/sqliteInt.h 5dbb7a934a88dfa9893e2627f4821b0464f5edc0
 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12
@@ -568,7 +568,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 4bdfe1419c536fec5b3c0a7fbe3d0ff52f183f43
-R ef8c07e08dd9f512fe2fb64c573a68e8
+P e14e3688eb64577a2a7070e4e47e715a5d7d5089
+R d153c0e3a7a30a92852af782bebeb3e7
 U danielk1977
-Z 77487b8985e6f89316a2736312affc63
+Z 0d44ea64241f36be6571ec0c2f8d4fc2
diff --git a/manifest.uuid b/manifest.uuid
index afd1a8f1b6..e70bc678d7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e14e3688eb64577a2a7070e4e47e715a5d7d5089
\ No newline at end of file
+5a22d8695b49cf7bc2eee382b66a98d29adb9e6e
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index ae36615aaf..a1a0041e9b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -985,10 +985,9 @@ static int unixSync(sqlite3_file *id, int flags){
   int isDataOnly = (flags&SQLITE_SYNC_DATAONLY);
   int isFullsync = (flags&0x0F)==SQLITE_SYNC_FULL;
 
-  /* Check that one of SQLITE_SYNC_NORMAL, FULL or BARRIER was passed */
+  /* Check that one of SQLITE_SYNC_NORMAL or FULL was passed */
   assert((flags&0x0F)==SQLITE_SYNC_NORMAL
       || (flags&0x0F)==SQLITE_SYNC_FULL
-      || (flags&0x0F)==SQLITE_SYNC_BARRIER
   );
 
   assert( pFile );
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index f9ba117d31..5e2ac6bc58 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.248 2007/08/30 14:10:30 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.249 2007/08/30 14:49:58 danielk1977 Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -398,15 +398,10 @@ 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_BARRIER flag
-** means that the nothing actually needs to be synched to mass storage,
-** but all write operations that occur before the barrier must complete
-** before any write operations that occur after the barrier begin.
-** The SQLITE_SYNC_NORMAL means to use normal fsync() semantics.
-** The SQLITE_SYNC_FULL flag means to use Mac OS-X style fullsync
-** instead of fsync().
-*/
-#define SQLITE_SYNC_BARRIER       0x00001
+** information need not be flushed.  The SQLITE_SYNC_NORMAL means 
+** to use normal fsync() semantics.  The SQLITE_SYNC_FULL flag means 
+** to use Mac OS-X style fullsync instead of fsync().
+*/
 #define SQLITE_SYNC_NORMAL        0x00002
 #define SQLITE_SYNC_FULL          0x00003
 #define SQLITE_SYNC_DATAONLY      0x00010
@@ -434,14 +429,14 @@ struct sqlite3_file {
 ** an instance of the following object.  This object defines the
 ** methods used to perform various operations against the open file.
 **
-** The flags argument to xSync may be one of SQLITE_SYNC_BARRIER,
-** SQLITE_SYNC_NORMAL, SQLITE_SYNC_FULL.  The first choice means that
-** data is not necessarily synced to disk completely, only that
-** all writes that occur before the sync complete before any
-** writes that occur after the sync.  The second flag is the
-** normal fsync().  The third flag is a OS-X style fullsync.
-** The SQLITE_SYNC_DATA flag may be ORed in to indicate that only
-** the data of the file and not its inode needs to be synced.
+** The flags argument to xSync may be one of SQLITE_SYNC_NORMAL or
+** SQLITE_SYNC_FULL.  The first choice means that data is not
+** necessarily synced to disk completely, only that all writes that
+** occur before the sync complete before any writes that occur after the
+** sync.  The second flag is the normal fsync().  The third flag is a
+** OS-X style fullsync.  The SQLITE_SYNC_DATA flag may be ORed in to
+** indicate that only the data of the file and not its inode needs to be
+** synced.
 ** 
 ** The integer values to xLock() and xUnlock() are one of
 ** SQLITE_LOCK_NONE, SQLITE_LOCK_READ, SQLITE_LOCK_RESERVED,