Merge with [e79dac3c2f].

FossilOrigin-Name: 1e793d3a6d46ec5d744e077b10362e7cfa118eef
This commit is contained in:
dan 2010-04-24 04:53:15 +00:00
commit 4f08d4b848
3 changed files with 8 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C Reserve\ssome\sspace\sat\sthe\sstart\sof\sthe\slog-summary\sfile\sto\sapply\slocks\sto.
D 2010-04-24T04:49:15
C Merge\swith\s[e79dac3c2f].
D 2010-04-24T04:53:16
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -147,7 +147,7 @@ F src/mutex_noop.c 5f58eaa31f2d742cb8957a747f7887ae98f16053
F src/mutex_os2.c 20477db50cf3817c2f1cd3eb61e5c177e50231db
F src/mutex_unix.c 04a25238abce7e3d06b358dcf706e26624270809
F src/mutex_w32.c 4cc201c1bfd11d1562810554ff5500e735559d7e
F src/notify.c f799bbda67ab6619b36b0a24153b49518874a203
F src/notify.c cbfa66a836da3a51567209636e6a94059c137930
F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
@ -808,7 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 480d12db4c0ebcc37598f7620d39193875eab15b
R f27ff96a8474356c5e71b7eed104ff79
P a031aa1fa01f062b087154833738f011f7bc4eb5 e79dac3c2f723ed7cc62fcef468f53952711f242
R 39ee25bf2853e2a576b8db264ae5f0b2
U dan
Z 9b426b4ef3d6b692bab78cb4477e0b43
Z 61f7a505aff9cfe44f8682955cde1b74

View File

@ -1 +1 @@
a031aa1fa01f062b087154833738f011f7bc4eb5
1e793d3a6d46ec5d744e077b10362e7cfa118eef

View File

@ -157,6 +157,7 @@ int sqlite3_unlock_notify(
if( xNotify==0 ){
removeFromBlockedList(db);
db->pBlockingConnection = 0;
db->pUnlockConnection = 0;
db->xUnlockNotify = 0;
db->pUnlockArg = 0;