From: drh <drh@noemail.net>
Date: Thu, 27 Sep 2012 12:11:25 +0000 (+0000)
Subject: Merge the "PRAGMA busy_timeout" change into trunk.
X-Git-Tag: version-3.7.15~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cec320fb0e09e1b7f0bb1ecefb67066aa2d14095;p=thirdparty%2Fsqlite.git

Merge the "PRAGMA busy_timeout" change into trunk.

FossilOrigin-Name: 1a679a1ef3b4f2d898c8cd83432d2b4c12bd93fa
---

cec320fb0e09e1b7f0bb1ecefb67066aa2d14095
diff --cc manifest
index 2e6bf42149,4ffa80d78b..88b0955609
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Remove\san\sunused\ssubfunction\sparameter\sand\san\sobsolete\scomment\sfrom\sthe\nquery\splanner\slogic\sin\swhere.c.
- D 2012-09-24T19:50:00.842
 -C Correct\stwo\stest\snames\sto\smake\sthem\sunique.
 -D 2012-09-07T20:10:30.599
++C Merge\sthe\s"PRAGMA\sbusy_timeout"\schange\sinto\strunk.
++D 2012-09-27T12:11:25.613
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 +F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 2d696f01c228995e98b3b953a08b7bba1d48c130
 -F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 +F Makefile.msc d97ae1025a1b7bb2b365b135fc0aa25247e736b2
 +F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION a71848df48082f1d6585d4b0819d530fc455485d
 +F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -143,7 -145,7 +143,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 97d13e749ae84fe62238a5940c5b46b2b22cd369
 -F src/main.c 0b321fc873ff2c09b996dea9f74443e4cd9ae28d
++F src/main.c 46c1587731380919b00f375a829e1a19f89282e8
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -168,8 -170,8 +168,8 @@@ F src/parse.y f29df90bd3adc64b33114ab1d
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
- F src/pragma.c 44304a69ae1486d7c3fd2d3bdd52cb555398a347
 -F src/pragma.c 360ac85ad9bfbab2302e8b7ba524af842f497cef
 -F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
++F src/pragma.c 7f5a0fa6dead752d9af3a1e1d16bace81d22ef95
 +F src/prepare.c 931ad0d852a0df48f79adcba6ce79ca5f475625c
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
@@@ -1016,7 -1014,7 +1016,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 22989f3588531efd555cc29d6c576e7a34b7edc4
- R af274415395e47bec73279dd70f3872e
 -P 7be5bc36798d30f50658b70fc0bd31af897f3a87
 -R 0d92940b96f13ff3dc822c3dd51f8373
 -U mistachkin
 -Z ac2b57c54956518a08fcca693b6facfe
++P 349a55cd8ba9ce65ebfd987ecfebd1204f7d0a85 43e474d3e9364e6ed417db06e98faa3e5bc2eb26
++R 5a669a0b1c46b5fd25601e00205c57db
 +U drh
- Z 2c59ca6ec247c019d5fe7043b4d83355
++Z 91e60aa7644657f70b6c3a01cca7ec80
diff --cc manifest.uuid
index 2d6a191e78,b0647f7277..4e4eaae004
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 349a55cd8ba9ce65ebfd987ecfebd1204f7d0a85
 -43e474d3e9364e6ed417db06e98faa3e5bc2eb26
++1a679a1ef3b4f2d898c8cd83432d2b4c12bd93fa