mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge of notify.c changes from experimental.

Browse Source 
Reset stored blocking connection when registered unlock_notify callback is cleared.

FossilOrigin-Name: e79dac3c2f723ed7cc62fcef468f53952711f242
This commit is contained in:
shaneh 2010-04-23 14:29:04 +00:00
commit 9a6e897328
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@ -1,8 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Change\ssqlite3_step()\sso\sthat\sit\sautomatically\scalls\ssqlite3_reset()\sinstead\nof\sreturning\sSQLITE_MISUSE\swhen\sinvoked\son\sa\sprepared\sstatement\sthat\npreviously\sreturned\sany\svalue\sother\sthan\sSQLITE_ROW.
D 2010-04-17T12:53:20
C Merge\sof\snotify.c\schanges\sfrom\sexperimental.\s\s\nReset\sstored\sblocking\sconnection\swhen\sregistered\sunlock_notify\scallback\sis\scleared.
D 2010-04-23T14:29:04
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -148,7 +145,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
@ -801,14 +798,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P f96782b389b5b97b488dc5814f7082e0393f64cd
R b3683c8d5f87dead098717870c446ce4
U drh
Z 68bc4fd82825f4b7f1278d3f78ee95b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLya9GoxKgR168RlERAvQaAJwLUmtTGSRsZdMt+rOX4V9Acu7enQCdFgG+
yMxp/Ep2vaOwFANf9gUAX1Q=
=yLEB
-----END PGP SIGNATURE-----
P 3e646e3f4cd0ca288e444561e951cecfdaee2ab5 95ff76ef67d6189f54375973fa485d6eb464b029
R 7c539ea1b6c4af52a0f9e1df86aac19e
U shaneh
Z bd2044fda76be379d81bb4e3c420d2ab

2
manifest.uuid
View File

@ -1 +1 @@
3e646e3f4cd0ca288e444561e951cecfdaee2ab5
e79dac3c2f723ed7cc62fcef468f53952711f242

1
src/notify.c
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;