From: drh <drh@noemail.net>
Date: Fri, 16 Sep 2011 01:38:53 +0000 (+0000)
Subject: Merge the [002caede898] fix into trunk.
X-Git-Tag: version-3.7.8~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffd5075d7c887b870b44ad361b587a58dc48ad30;p=thirdparty%2Fsqlite.git

Merge the [002caede898] fix into trunk.

FossilOrigin-Name: 95708ae2235658c3a49679e2fe252a058793366a
---

ffd5075d7c887b870b44ad361b587a58dc48ad30
diff --cc manifest
index 2fde9a8aa6,a699cee609..53bb75791c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Cleanup/fix\serror\shandling\swhen\sno\sarguments\sare\ssupplied\sto\sthe\sSQLite\sanalyzer.
- D 2011-09-15T00:40:11.725
 -C Add\sthe\snew\sOP_Once\sopcode.\s\sUse\sit\sto\sclean\sup\sand\ssimplify\svarious\none-time\sinitialization\ssections\sin\sthe\scode,\sincluding\sthe\sfix\sfor\nticket\s[002caede898ae].
 -D 2011-09-16T01:34:43.377
++C Merge\sthe\s[002caede898]\sfix\sinto\strunk.
++D 2011-09-16T01:38:53.253
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -961,7 -961,7 +961,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P 3035dc1c7398791d550f4c02774ef7f961b4bb02
- R 58029ae8750333d2c5d6f46b6d3f7365
- U mistachkin
- Z 3ee1857491433480e0555890625ce07e
 -P 4b8357ee3c4ccdbd34e0cd077efd84cca677f496
++P 3fc566ac5dfce314ee414a3fb79daeeed6d0f179 7f00552b739fad79517b042a6ed61abe743a917b
+ R dfebcfb6ba63e648417a1c83afb0ef8f
+ U drh
 -Z cfef9124ccdf6e060b8c4225e574e5d5
++Z baf4ff7d9b925e2ad8e253a721fec7c0
diff --cc manifest.uuid
index 54f2b7b254,727ead5844..298e9bf272
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3fc566ac5dfce314ee414a3fb79daeeed6d0f179
 -7f00552b739fad79517b042a6ed61abe743a917b
++95708ae2235658c3a49679e2fe252a058793366a