From: drh <drh@noemail.net>
Date: Fri, 16 Oct 2015 20:20:08 +0000 (+0000)
Subject: Merge the version 3.9.1 updates.
X-Git-Tag: version-3.13.0~148^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db990147917f9dc8b13f2d2f6240d28c8df9212;p=thirdparty%2Fsqlite.git

Merge the version 3.9.1 updates.

FossilOrigin-Name: 2bbb9595ccc4fdd854bf16a1efcddbc42a7ff14e
---

5db990147917f9dc8b13f2d2f6240d28c8df9212
diff --cc manifest
index 807c51274c,4136b6383d..b9aa294668
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sthe\sfinal\sfew\schanges\sbefore\sthe\s3.9.0\srelease.
- D 2015-10-13T20:42:16.270
 -C Version\s3.9.1
 -D 2015-10-16T17:31:12.550
++C Merge\sthe\sversion\s3.9.1\supdates.
++D 2015-10-16T20:20:08.651
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 +F Makefile.in de2700ab4ca481c15970405274ccf3c872026e3c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
 +F Makefile.msc 9025b539b5dc491ea9c6c9c04109d2ff617bc990
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
+ F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1378,8 -1357,8 +1378,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 -F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
 +F tool/mksqlite3c.tcl a52d7e8c0888f9384fbfa2c6ddd5f357409758b9
- F tool/mksqlite3h.tcl 39ed050ffc5ec8951bd5118c06a132ef41b859c7
++F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1411,7 -1390,10 +1411,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ed174ccf0ae615647ba026fed649d26dc9a98640 9ecafc0c94102dca6da192f400278399464086fb
- R a593153eed6b8719602610a964f8f5af
 -P 746fcd2fd412ddc27071827fb20eb6df0741dfb1
 -R d66bf398f8de1fb81851cd37ab3877c3
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.9.1 *
++P e1afdbb50120f7d058b25538c6cb8ce3bb34993d 767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++R 416ec582b2ccbe834a5229a0e696d766
  U drh
- Z 09e44daf8eef00c891774cf00df5b0d3
 -Z 1827cdee71f363c0f73376b432ed6e27
++Z 46e0986ebe5f9df0f173f75bf0f33062
diff --cc manifest.uuid
index 68abaccd9d,b00e53a180..4ceef889fa
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e1afdbb50120f7d058b25538c6cb8ce3bb34993d
 -767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++2bbb9595ccc4fdd854bf16a1efcddbc42a7ff14e