Fixes so that the FULLSYNC changes will build on windows. They do not have

any effect, but neither do they cause errors. (CVS 2377)

FossilOrigin-Name: ace3e30de1cde2e8990d8429b730ca5b68acd714

diff --git a/manifest b/manifest
index ea35b2853b5924f8cc27c0a11bc8aa52ee607772..b5f295d018754c64b992e0710001f362696c6145 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.1.4.\s(CVS\s2376)
-D 2005-03-11T04:40:24
+C Fixes\sso\sthat\sthe\sFULLSYNC\schanges\swill\sbuild\son\swindows.\s\sThey\sdo\snot\shave\nany\seffect,\sbut\sneither\sdo\sthey\scause\serrors.\s(CVS\s2377)
+D 2005-03-11T04:41:40
 F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -64,7 +64,7 @@ F src/sqlite.h.in c85f6bad9ca7de29f505fe886646cfff7df4c55e
 F src/sqliteInt.h b59243adc43f0326ca7d8ce0b7ebd3cc70bd670d
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 29e56ecdb94c4066dbe6b088d12cc2404bc9597e
-F src/test1.c 3ef73fd9221086cf2990c23070767fae46e6d47d
+F src/test1.c dd3e4961f3b9b235a68d4af5d77a06eb7be73184
 F src/test2.c 7f0ef466706ac01414e1136b96e5d8a65cb97545
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
@@ -195,7 +195,7 @@ F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c 97a830d53c24c42290501fdfba4a6e5bdd34748b
 F test/trace.test a54fa8df0d01cf827289a7659d78959e8fd2f955
-F test/trans.test f32e3966f2d0045fb60866b569a788e703495f0b
+F test/trans.test ab6924a953fd2b262f77ea1aa5f11c05f6a10447
 F test/trigger1.test 9db1a7c91930baa2dc60ce72c7e969900bf2ae8a
 F test/trigger2.test cbc8fe3775904d5b49ff26888aa39df7341fae7c
 F test/trigger3.test 9102fd3933db294dc654b5aee9edfe9e94f2b9e2
@@ -274,7 +274,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P a7261f1590367932db23f5c8d6d785887df1e8dd
-R 123be01dc9def5566953db9dd8cc65e4
+P e438b65cf9606f5564b28857ba9625665d57f1f6
+R 52049a3f201fa25e282179868a0fb9fd
 U drh
-Z c9a9ad0ee7f6aff06167067e7603f66d
+Z ec6d22a621c856855d98c663c562375c

diff --git a/manifest.uuid b/manifest.uuid
index 59ed97a885f2d845148e2bf90b19bbd53ad4fc45..90a5cc731dff2ef4715d6b5c0a2fc0f70cd680b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e438b65cf9606f5564b28857ba9625665d57f1f6
\ No newline at end of file
+ace3e30de1cde2e8990d8429b730ca5b68acd714
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 04425786857364df04c48624402192a849be2dbe..52e75217d548075cba9844c01beaaf9c092e1caf 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.133 2005/03/10 14:11:13 drh Exp $
+** $Id: test1.c,v 1.134 2005/03/11 04:41:40 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -3001,10 +3001,12 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
       (char*)&sqlite3_temp_directory, TCL_LINK_STRING);
   Tcl_LinkVar(interp, "bitmask_size",
       (char*)&bitmask_size, TCL_LINK_INT|TCL_LINK_READ_ONLY);
+#if OS_UNIX
   Tcl_LinkVar(interp, "sqlite_sync_count",
       (char*)&sqlite3_sync_count, TCL_LINK_INT);
   Tcl_LinkVar(interp, "sqlite_fullsync_count",
       (char*)&sqlite3_fullsync_count, TCL_LINK_INT);
+#endif /* OS_UNIX */
   set_options(interp);
   return TCL_OK;
 }

diff --git a/test/trans.test b/test/trans.test
index 5227183e34daa2c611e9044ea77f5a61c0a3967d..a7e942c3105074f065e334b98ecc996044e1b05d 100644 (file)
--- a/test/trans.test
+++ b/test/trans.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: trans.test,v 1.24 2005/03/10 14:11:13 drh Exp $
+# $Id: trans.test,v 1.25 2005/03/11 04:41:40 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -884,12 +884,14 @@ for {set i 2} {$i<=$limit} {incr i} {
          INSERT INTO t3 SELECT randstr(10,400) FROM t3 WHERE random()%10==0;
        }
     } {}
-    do_test trans-9.$i.4-$cnt {
-       expr {$sqlite_sync_count>0}
-    } 1
-    do_test trans-9.$i.5-$cnt {
-       expr {$sqlite_fullsync_count>0}
-    } [expr {$i%2==0}]
+    if {$tcl_platform(platform)=="unix"} {
+      do_test trans-9.$i.4-$cnt {
+         expr {$sqlite_sync_count>0}
+      } 1
+      do_test trans-9.$i.5-$cnt {
+         expr {$sqlite_fullsync_count>0}
+      } [expr {$i%2==0}]
+    }
   }
   set ::pager_old_format 0
 }