From: dan <dan@noemail.net>
Date: Tue, 1 Sep 2009 16:39:06 +0000 (+0000)
Subject: Merge in changes to support recursive invocation of triggers (disabled by default).
X-Git-Tag: fts3-refactor~218
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c94888d07f4e5c4e314f1bf8770f3718748b0ec;p=thirdparty%2Fsqlite.git

Merge in changes to support recursive invocation of triggers (disabled by default).

FossilOrigin-Name: c1b388c30de1b660c56afbcac9c69700500808a9
---

3c94888d07f4e5c4e314f1bf8770f3718748b0ec
diff --cc manifest
index 33b41d8f76,df05713bf2..7ce48f9330
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C More\sthorough\sinitialization\sof\sa\sbuffer\swhen\swriting\sthe\srollback\sjournal\nheader,\sin\sorder\sto\sprevent\sa\sharmless\svalgrind\swarning.\nCVSTrac\sticket\s#4039
- D 2009-08-31T16:09:59
 -C Add\snew\stest\sscript\striggerC.test.
 -D 2009-09-01T16:19:19
++C Merge\sin\schanges\sto\ssupport\srecursive\sinvocation\sof\striggers\s(disabled\sby\sdefault).
++D 2009-09-01T16:39:06
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -750,15 -748,8 +748,8 @@@ F tool/speedtest16.c c8a9c793df96db7e49
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
- F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
- P 6abcba1021b237452f542f1fbb69eb75d9f50f53
- R 3214f074a14462fb9e96d75b13564e70
- U drh
- Z 1d55cf71a62a55978d3163a870a9fc02
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFKm/XboxKgR168RlERArBMAJ9T7O5vuB1uCdEihrXB/n4t3eJDtQCePxqX
- HHms1P8yqpZacj8LVysqzOY=
- =3H49
- -----END PGP SIGNATURE-----
+ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 -P 38a9327bad1a01e3d7a47fad44ece2f6c7e88643
 -R 1df7bed4841ce53fcaba0907c0d2e83a
++P 5e2f5496834bffb79236f803cdfedb18fbd533b7 a2a062a4b52f45af85c195582a36d1b76d2675db
++R bdae7ca38a0ff6f2a23becb7bc516ab2
+ U dan
 -Z 25a88a87e4ee91c661bde2c4b892fd01
++Z f119bed83386ec346d66a132d507d343
diff --cc manifest.uuid
index d2a93afaa6,71e30eb46f..96ef8c3656
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5e2f5496834bffb79236f803cdfedb18fbd533b7
 -a2a062a4b52f45af85c195582a36d1b76d2675db
++c1b388c30de1b660c56afbcac9c69700500808a9