aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest24
-rw-r--r--manifest.uuid2
-rw-r--r--src/mutex_w32.c2
3 files changed, 9 insertions, 19 deletions
diff --git a/manifest b/manifest
index ac898a1f5..a007a938e 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Merge\sthe\sunix-excl\sVFS\sinto\sthe\strunk.\s\sThis\smerge\salso\sadds\sthe\s-vfs\noption\sto\sthe\scommand-line\sshell.
-D 2011-03-14T13:54:01.926
+C Fix\scut-and-paste\stypo\sin\sdebugging\sprint\sstatement\sin\swinMutexTry().
+D 2011-03-15T02:55:28.657
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -159,7 +156,7 @@ F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
F src/mutex_noop.c d5cfbca87168c661a0b118cd8e329a908e453151
F src/mutex_os2.c f5d09e85b914643c230aa97db709fc0db370d93c
F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
-F src/mutex_w32.c 3ade5ae71449d1d023f0ebb3184c2ae6aa9307e4
+F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
@@ -916,14 +913,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b86999436ec2414c990ba720441fe316f647eef6 a05a6d40875df674f9c2b46e33128c6878d4edaa
-R ae21c3eefa2912bdd40576825c99670e
-U drh
-Z ba80be8ddf09d06ab5258c5662ce63ed
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNfh39oxKgR168RlERAmUtAJ9euZA2mXv2u5a2MP0I1/796quLkACfTDGF
-KRyVKh4JS29RnQdWZdfQ0tU=
-=K1xX
------END PGP SIGNATURE-----
+P 3934b004e93852c89b937ec20431de96a2e99440
+R a3bacb1f22d0b4cfa6cea5cf5efe9cdf
+U shaneh
+Z 62a7f6dd55f1de5255b8d7f88e967001
diff --git a/manifest.uuid b/manifest.uuid
index f95850683..03da2a631 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3934b004e93852c89b937ec20431de96a2e99440 \ No newline at end of file
+def98fd23e42bda13547e38ab13fed0e6554ce99 \ No newline at end of file
diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index 8e257a91b..bfd9dacf6 100644
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -280,7 +280,7 @@ static int winMutexTry(sqlite3_mutex *p){
#endif
#ifdef SQLITE_DEBUG
if( rc==SQLITE_OK && p->trace ){
- printf("enter mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
+ printf("try mutex %p (%d) with nRef=%d\n", p, p->trace, p->nRef);
}
#endif
return rc;