The crash test works now, at least on unix. Untested on windows. But it never

worked on windows before so if it still does not there is no big loss.  I am
still troubled by the current design of the OS overloading mechanism.  Expect
to see more changes. (CVS 2794)

FossilOrigin-Name: fa1d7ecfcc648fbe9fc6d92e080cf937bdc9c439

diff --git a/manifest b/manifest
index 9d9e6352e401f00b59493da3876ad4f15031df2b..ceab987923ef9ed6ee781a3fe6e64f804ccbd632 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sbuild\swork\son\swindows\sagain.\s\sTicket\s#1544.\s(CVS\s2793)
-D 2005-11-29T19:50:25
+C The\scrash\stest\sworks\snow,\sat\sleast\son\sunix.\s\sUntested\son\swindows.\sBut\sit\snever\nworked\son\swindows\sbefore\sso\sif\sit\sstill\sdoes\snot\sthere\sis\sno\sbig\sloss.\s\sI\sam\nstill\stroubled\sby\sthe\scurrent\sdesign\sof\sthe\sOS\soverloading\smechanism.\s\sExpect\nto\ssee\smore\schanges.\s(CVS\s2794)
+D 2005-11-29T19:56:32
 F Makefile.in eac4c98a32a0eae9d6bb2779ac74bbb5441758d3
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -54,7 +54,7 @@ F src/os.h 4172cf1dfb84ce13fe5f1073accbc320b4b25ad2
 F src/os_common.h d74a11728ad2444b6b695b94c28c06881f049e49
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 02b6a1c7e7a646da10f41f8ed3364a2a1c33c135
+F src/os_unix.c 471d3642d0f41ecd4113b17b618f487cf8237f0f
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 2095cae6b283edc4e6b9d9d6a8a509210ea51eac
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -323,7 +323,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 966bc68e1bf4e0cc88407871c162ee3014160415
-R fff5192ec05195c47f01284580b629fa
+P 59bdca2552b2e5c09d5ca2b7a02ee34460139d7b
+R 017afb31f003c30d6ff4dc490b01097c
 U drh
-Z 9e4962749cc7ab5edc65f043e5a44501
+Z 38c6fa4706794e96cb17051f7e19d848

diff --git a/manifest.uuid b/manifest.uuid
index c275ff2ea7786a177454d2671f8df934df64fa9c..237589d16a124535b6d4b45bad04a019ef159c4f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59bdca2552b2e5c09d5ca2b7a02ee34460139d7b
\ No newline at end of file
+fa1d7ecfcc648fbe9fc6d92e080cf937bdc9c439
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index cf855277009cb5f536570e852b3a1fa07e25e335..c12c59b0c9cac5a63d059c3690490fe767d9781a 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1399,7 +1399,7 @@ static int unixClose(OsFile **pId){
   OsFile *id = *pId;
   if( !id ) return SQLITE_OK;
   if( CHECK_THREADID(id) ) return SQLITE_MISUSE;
-  sqlite3Io.xUnlock(id, NO_LOCK);
+  unixUnlock(id, NO_LOCK);
   if( id->dirfd>=0 ) close(id->dirfd);
   id->dirfd = -1;
   sqlite3OsEnterMutex();