From: dan <dan@noemail.net>
Date: Thu, 6 Dec 2012 19:41:44 +0000 (+0000)
Subject: Merge the constant-refactoring-in-triggers branch with the trunk.
X-Git-Tag: version-3.7.15~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd4d47053d5cd8774d408a9428a242dde71716ee;p=thirdparty%2Fsqlite.git

Merge the constant-refactoring-in-triggers branch with the trunk.

FossilOrigin-Name: 79ef8e3c7798dfdf37359ac816e886a43ba9d98d
---

fd4d47053d5cd8774d408a9428a242dde71716ee
diff --cc manifest
index 8b6632de60,6a5a27c92a..e9bc4c0b63
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sSQLITE_FCNTL_TEMPFILENAME\sfile\scontrol\sthat\sasks\sthe\sunderlying\sVFS\nto\sreturn\sa\snew\stemporary\sfilename.\s\sPer\srequest\sfrom\sNSS\steam\sat\sMozilla.
- D 2012-12-06T19:01:42.467
 -C Apply\sthe\ssame\srestrictions\son\sconstant\srefactoring\sto\sstatements\swithin\sa\strigger\sprogram\sas\stop-level\sstatements.\sCandidate\sfix\sfor\s[ae3c5670b6].
 -D 2012-12-06T19:37:22.521
++C Merge\sthe\sconstant-refactoring-in-triggers\sbranch\swith\sthe\strunk.
++D 2012-12-06T19:41:44.312
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1025,7 -1025,10 +1025,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P d507648d820cfea70e17f3d21c35c932a2d20367
- R eb2cb26563b5f98893b41a686dd89dac
- U drh
- Z a78031be2e88797bf9b27c616571dbb4
 -P 1a63b1d5fa5d79f96eddbda6d94bc10248863710
++P 1a63b1d5fa5d79f96eddbda6d94bc10248863710 0c31a46801746191d1a53332d75beda880fe1fd7
+ R 919f27f45c7dc1e6e97e702080115442
 -T *branch * constant-refactoring-in-triggers
 -T *sym-constant-refactoring-in-triggers *
 -T -sym-trunk *
+ U dan
 -Z 10c6ff069df8e2b9b146f1c13827ef9e
++Z b91d171a2c4500533640db47363b9d5b
diff --cc manifest.uuid
index 3e42a7d077,515161250d..7f3661b4f3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1a63b1d5fa5d79f96eddbda6d94bc10248863710
 -0c31a46801746191d1a53332d75beda880fe1fd7
++79ef8e3c7798dfdf37359ac816e886a43ba9d98d