Add support for SQLITE_NO_SYNC for OS/2, too. (CVS 5918)

FossilOrigin-Name: 2990b5b8e7bd8f91af24e5a606666077855ae283

diff --git a/manifest b/manifest
index 0e438e456b29157aa996400381b928284e562a7f..e0d8ff9370274cca4bd5bc1893a2a6f1e43b67da 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Expose\sthe\sMBCS->UTF8\sconvert\sroutine\sin\sthe\sWin32\sbackend.\s(CVS\s5917)
-D 2008-11-18T19:18:52
+C Add\ssupport\sfor\sSQLITE_NO_SYNC\sfor\sOS/2,\stoo.\s(CVS\s5918)
+D 2008-11-18T23:03:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 6cbc7db84c23804c368bc7ffe51367412212d7b2
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -136,7 +136,7 @@ F src/mutex_w32.c 017b522f63ef09b834fefc9daa876c9ec167e7b5
 F src/os.c 0b411644b87ad689d7250bbfd1834d99b81a3df4
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
-F src/os_os2.c 63be0987dbeb42e9b08c831863d2a315953b86e1
+F src/os_os2.c d12285d66df674c42f6f544a6f7c21bf1a954ee1
 F src/os_unix.c 16b0981836576ad7e0c96f094bd2f41a339d078f
 F src/os_win.c 08d0b059ac01f32e8813bb96fc573486592b83f5
 F src/pager.c d328fcea0bfb3abbc174dba6e6b1ca7c0e1ed7ba
@@ -658,7 +658,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P db0f1203591fcc4c554c47cdf28abe279cf7f1d5
-R 32b837ae630be87201430ff0ce6dd755
-U drh
-Z 1b9e339fcbcd4e1282090097fa631f9c
+P f4411f0c8075adc8a37002ac7ad958ff3158c0c0
+R d6955add2239a6f2f254f4336539162f
+U pweilbacher
+Z a712bebfcb26c6919d0c8a2c12bc726c

diff --git a/manifest.uuid b/manifest.uuid
index bcefdb44836fe5634c71a456b916616f772bfdce..1b9c9d9a978070cf44c55de441a80a63d8fc1a3f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4411f0c8075adc8a37002ac7ad958ff3158c0c0
\ No newline at end of file
+2990b5b8e7bd8f91af24e5a606666077855ae283
\ No newline at end of file

diff --git a/src/os_os2.c b/src/os_os2.c
index 0a3b1434a84bafbf48e38ceadb085caea6d40324..56a8092c64a4263895a4c7ed1eec2064660259f2 100644 (file)
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $Id: os_os2.c,v 1.58 2008/11/07 00:06:18 drh Exp $
+** $Id: os_os2.c,v 1.59 2008/11/18 23:03:40 pweilbacher Exp $
 */
 
 #include "sqliteInt.h"
@@ -196,7 +196,14 @@ static int os2Sync( sqlite3_file *id, int flags ){
   }
   sqlite3_sync_count++;
 #endif
+  /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a
+  ** no-op
+  */
+#ifdef SQLITE_NO_SYNC
+  return SQLITE_OK;
+#else
   return DosResetBuffer( pFile->h ) == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;
+#endif
 }
 
 /*