From: shaneh <shaneh@noemail.net>
Date: Fri, 23 Apr 2010 14:29:04 +0000 (+0000)
Subject: Merge of notify.c changes from experimental.
X-Git-Tag: version-3.7.2~465
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6e897328371a17f4ead1cd72c12240d372a81a;p=thirdparty%2Fsqlite.git

Merge of notify.c changes from experimental.
Reset stored blocking connection when registered unlock_notify callback is cleared.

FossilOrigin-Name: e79dac3c2f723ed7cc62fcef468f53952711f242
---

9a6e897328371a17f4ead1cd72c12240d372a81a
diff --cc manifest
index 9fe9013723,b16c49d182..b2b5616710
--- a/manifest
+++ b/manifest
@@@ -1,8 -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 It\sis\spossible\sfor\ssqlite3.pUnlockConnection\sto\sbe\snon-NULL\swhen\nsqlite3.pBlockingConnection\sis\sNULL,\sas\sthe\snotify1.test\sscript\ndemonstrates.
 -D 2010-04-17T16:10:19
++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
@@@ -801,14 -801,14 +798,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f96782b389b5b97b488dc5814f7082e0393f64cd
- R b3683c8d5f87dead098717870c446ce4
 -P c54e8dad01b0ecaf8d66b10e64e862dcad8a6746
 -R 13909a17787fe24daf5817b78f495441
--U drh
- Z 68bc4fd82825f4b7f1278d3f78ee95b8
 -Z cdb4de73a4162744a1beea6762027d5a
-------BEGIN PGP SIGNATURE-----
--Version: GnuPG v1.4.6 (GNU/Linux)
--
- iD8DBQFLya9GoxKgR168RlERAvQaAJwLUmtTGSRsZdMt+rOX4V9Acu7enQCdFgG+
- yMxp/Ep2vaOwFANf9gUAX1Q=
- =yLEB
 -iD8DBQFLyd1yoxKgR168RlERAm3SAKCL+0wxu77deGVhwPtVYY39ulGa5ACdH99G
 -zJ0U301AQ+E8lKrWMWFetlQ=
 -=LJR8
-------END PGP SIGNATURE-----
++P 3e646e3f4cd0ca288e444561e951cecfdaee2ab5 95ff76ef67d6189f54375973fa485d6eb464b029
++R 7c539ea1b6c4af52a0f9e1df86aac19e
++U shaneh
++Z bd2044fda76be379d81bb4e3c420d2ab
diff --cc manifest.uuid
index 9d8bb1e648,542f64d6b2..80f48ee222
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3e646e3f4cd0ca288e444561e951cecfdaee2ab5
 -95ff76ef67d6189f54375973fa485d6eb464b029
++e79dac3c2f723ed7cc62fcef468f53952711f242