From: drh <drh@noemail.net>
Date: Mon, 15 Feb 2016 17:39:10 +0000 (+0000)
Subject: Merge 3.11.0 changes.
X-Git-Tag: version-3.13.0~148^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f219fad58bb84f5e856134a7b6909c8c0482c9b;p=thirdparty%2Fsqlite.git

Merge 3.11.0 changes.

FossilOrigin-Name: 631023dd9aa19cd8d92d712941d58e7148821995
---

7f219fad58bb84f5e856134a7b6909c8c0482c9b
diff --cc manifest
index cd68f2e235,a33ec564a2..cdce0eb4b0
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sanother\stest\sproblem\sin\ssessionfault.test.
- D 2016-02-13T15:08:25.504
 -C Version\s3.11.0
 -D 2016-02-15T17:29:24.141
 -F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
++C Merge\s3.11.0\schanges.
++D 2016-02-15T17:39:10.662
 +F Makefile.in 5cbf3f753328d1bcd3a6117785b4874d99612f8f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
 +F Makefile.msc 45e596bd4ccecf2256f68a2e96466aa52cc4bc1f
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -377,7 -357,7 +377,7 @@@ F src/sqliteInt.h a6127f268ee02e6f792e5
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c 769c38453ec3e9dfc60822ed1d17f4bc76de1db6
 -F src/tclsqlite.c 13debcc6a5ca1217486f8903768c01114fbe8b58
++F src/tclsqlite.c 89b27573473e94257d9a2d296bc6c0626c9314d0
  F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
@@@ -1448,7 -1427,10 +1448,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6c2d34df76fb7823f307c11a1135ab30674421a9
- R aed6007c61153b78ae015657d3f9bbb0
- U dan
- Z 2a607f92ff5c33f0d10318ab25e2fc68
 -P f694e60a79024967a3f4574e3928f0b28589d381
 -R f2e9debe8cf42a0179962a66a44645cf
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.11.0 *
++P f6d1cf79437f892220e93635c377513160ee7fd7 3d862f207e3adc00f78066799ac5a8c282430a5f
++R b476bf4ab3b143a25fb59e5c7bd22337
+ U drh
 -Z e719a8e2c047e401006dde85de2084bf
++Z a1cb35e211e072ee0c64a1a99f864eec
diff --cc manifest.uuid
index 8004dd0734,474c1210cb..2fbe2597df
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f6d1cf79437f892220e93635c377513160ee7fd7
 -3d862f207e3adc00f78066799ac5a8c282430a5f
++631023dd9aa19cd8d92d712941d58e7148821995