os_win.c is now working with the new locking protocol. (CVS 1581)

FossilOrigin-Name: 77c5eaa10a9d2e2bb8f89b7434d6e6efbacf35e9

diff --git a/manifest b/manifest
index da390906e32edf06d0e2a1296ff42dd4cf903f0e..045040dcd4000c8df4d7b0cdd130e782bba3d09a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sspeed\simprovements.\s(CVS\s1580)
-D 2004-06-13T00:54:02
+C os_win.c\sis\snow\sworking\swith\sthe\snew\slocking\sprotocol.\s(CVS\s1581)
+D 2004-06-13T23:07:04
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -26,7 +26,7 @@ F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c 93b8ecec4a8d7b4e9f2479e2327d90c9d01765e8
 F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79
-F src/btree.c fed8a295ebb11c2ebadb473c04cd3ba55c17e934
+F src/btree.c 5591068c5ed0e5d65938d41ac9e3fe6f461fdb07
 F src/btree.h 589427ac13bb544d298cd99726e2572a6fe4bdaa
 F src/build.c 916a84fa5f8bfd44dbe14c3d7c923dd07ee7373f
 F src/date.c 65b483caeb0e4dd663667d2f927caa058168ebff
@@ -38,7 +38,7 @@ F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f
 F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
 F src/insert.c 68c7f3ddd6a7f1e5596d6996da1a2861b3789a3a
 F src/legacy.c ad23746f15f67e34577621b1875f639c94839e1f
-F src/main.c 9061fff2b04759d849155a334bf2a9f158d325d7
+F src/main.c c68c873165e0ee0bdf4f6c2bc79b95c1d6c010c6
 F src/md5.c d77a389955759c8329bb357e3d71bac3d6eb710b
 F src/os.h 23c69c5084e71b5fe199ff1c4e35a4aded0f1380
 F src/os_common.h ba1b7306e16e2091718f2c48db0fe6c1d7a31bb8
@@ -83,7 +83,7 @@ F test/attach.test aed659e52635662bcd5069599aaca823533edf5a
 F test/attach2.test e6b5f0d735cf8f6c14acfa2ce69b925dbe316b3e
 F test/attach3.test 8259ab833b5dcdf4acd75d9653f42f703ce2e013
 F test/auth.test 95809b8f6a9bec18b94d28cafd03fe27d2f8a9e9
-F test/bigfile.test ea904b853ce2d703b16c5ce90e2b54951bc1ae81
+F test/bigfile.test 5b079dfe7354a6c43b92a3ea5e49e4e5d88c789e
 F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
 F test/bind.test 4f5a19e84077b61ea797644b4942bb98b17bdd42
 F test/blob.test b6474275536614352d6e1c729f23a18ba1082ae9
@@ -106,7 +106,7 @@ F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/date.test aed5030482ebc02bd8d386c6c86a29f694ab068d
 F test/delete.test ac14bd6df5f1581d646eebc013d6b844a885dcf6
 F test/enc.test a55481d45ff493804e8d88357feb4642fc50a6b2
-F test/enc2.test 1d469f58ee7f187bf06e11bd72a12bdea6362b2f
+F test/enc2.test b689600df49149d992381b8a02e826a92ab72cc8
 F test/expr.test 521588701dae8cf5aa2b8a18c5c897711f754332
 F test/fkey1.test d65c824459916249bee501532d6154ddab0b5db7
 F test/func.test a63cf7a16bbd9dd1430214f6a0625099faa530f3
@@ -223,7 +223,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 8029f1e465b900215acdff48c8eefb53c71341a8
-R 138e81a320888ca19cc24892b2fcae4f
+P c5ebc1c05eccc2c0697b6047a504954e11960f73
+R 4b53e920198647f93177549edf4e8baf
 U drh
-Z cc9b57c631b9118103ce79035012013e
+Z 362250ddf90f1c6b39b6cc80b805170c

diff --git a/manifest.uuid b/manifest.uuid
index 59b7f5c94f0ff029bd39d1a8ded8532b6bccc45a..809d329572a65570b6605702a49434fa845d4610 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5ebc1c05eccc2c0697b6047a504954e11960f73
\ No newline at end of file
+77c5eaa10a9d2e2bb8f89b7434d6e6efbacf35e9
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 73ce93bc0c3f0929ff91a8973051e0da766fc959..ccb7e571833ae7584160ecab9f99460757283c24 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.164 2004/06/13 00:54:02 drh Exp $
+** $Id: btree.c,v 1.165 2004/06/13 23:07:04 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -1504,7 +1504,7 @@ int sqlite3BtreeCursor(
   pCur->pBt = pBt;
   pCur->wrFlag = wrFlag;
   pCur->idx = 0;
-  pCur->info.nSize = 0;
+  memset(&pCur->info, 0, sizeof(pCur->info));
   pCur->pNext = pBt->pCursor;
   if( pCur->pNext ){
     pCur->pNext->pPrev = pCur;

diff --git a/src/main.c b/src/main.c
index 712d997f919e24c9285ac890e261e541e5a80d45..5319fc58b2099c65184a823725e0c5b0a8f8c98c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.218 2004/06/12 09:25:15 danielk1977 Exp $
+** $Id: main.c,v 1.219 2004/06/13 23:07:04 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1287,4 +1287,3 @@ int sqlite3_collation_needed16(
   db->pCollNeededArg = pCollNeededArg;
   return SQLITE_OK;
 }
-

diff --git a/test/bigfile.test b/test/bigfile.test
index d1ee9434a1acf3df0c1fe1505556eeb7e236f045..1f17af9c63f2620b1b2a92d578c7d5e5157f8779 100644 (file)
--- a/test/bigfile.test
+++ b/test/bigfile.test
@@ -12,7 +12,7 @@
 # focus of this script testing the ability of SQLite to handle database
 # files larger than 4GB.
 #
-# $Id: bigfile.test,v 1.3 2003/12/19 12:31:22 drh Exp $
+# $Id: bigfile.test,v 1.4 2004/06/13 23:07:04 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -67,6 +67,7 @@ do_test bigfile-1.2 {
   }
 } $::MAGIC_SUM
 
+
 # The previous test may fail on some systems because they are unable
 # to handle large files.  If that is so, then skip all of the following
 # tests.  We will know the above test failed because the "db" command

diff --git a/test/enc2.test b/test/enc2.test
index 0dfc8bd3d5eed233303c31e4533c4eb9676a8af4..4a79035c9585b29064e728ada1e0b18811d5ff5b 100644 (file)
--- a/test/enc2.test
+++ b/test/enc2.test
@@ -13,7 +13,7 @@
 # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and
 # UTF-16be).
 #
-# $Id: enc2.test,v 1.8 2004/06/10 14:01:08 danielk1977 Exp $
+# $Id: enc2.test,v 1.9 2004/06/13 23:07:04 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -111,6 +111,7 @@ do_test $t.10 {
 # The three unicode encodings understood by SQLite.
 set encodings [list UTF-8 UTF-16le UTF-16be]
 
+set sqlite_os_trace 0
 set i 1
 foreach enc $encodings {
   file delete -force test.db
@@ -119,6 +120,7 @@ foreach enc $encodings {
   execsql $dbcontents
   db close
   run_test_script enc2-$i $enc
+  db close
   incr i
 }
 
@@ -188,6 +190,7 @@ do_test enc2-5.3 {
   lappend res $::test_collate_enc
 } {one two three four five UTF-16BE}
 
+db close
 file delete -force test.db
 set DB [sqlite db test.db]
 execsql {pragma encoding = 'UTF-16LE'}
@@ -218,6 +221,7 @@ do_test enc2-5.7 {
   lappend res $::test_collate_enc
 } {one two three four five UTF-8}
 
+db close
 file delete -force test.db
 set DB [sqlite db test.db]
 execsql {pragma encoding = 'UTF-16BE'}
@@ -249,6 +253,3 @@ do_test enc2-5.11 {
 } {one two three four five UTF-8}
 
 finish_test
-
-
-