From: drh <drh@noemail.net>
Date: Mon, 22 Feb 2016 13:01:22 +0000 (+0000)
Subject: Merge up to trunk.
X-Git-Tag: version-3.20.0~165^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dc1918bbfdc681d9d6f91ee90d9d20db6c102a5;p=thirdparty%2Fsqlite.git

Merge up to trunk.

FossilOrigin-Name: f9e5fb88a5a14b26e9ea6997f449d0913f27a494
---

7dc1918bbfdc681d9d6f91ee90d9d20db6c102a5
diff --cc manifest
index af5d4531d2,2e26cd9363..5ccbf576b0
--- a/manifest
+++ b/manifest
@@@ -1,25 -1,20 +1,20 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2015-11-19T19:31:33.352
- F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 -C Add\san\sextra\stest\scase\sfor\sthe\schange\sin\scommit\s[c4295725].
 -D 2016-02-22T09:45:27.195
++C Merge\sup\sto\strunk.
++D 2016-02-22T13:01:22.781
+ F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc e928e68168df69b353300ac87c10105206653a03
+ F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
+ F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d
- F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
+ F autoconf/Makefile.am 29e2a6e8d0c5e32723a48b4faf6b168854dde5f4
+ F autoconf/Makefile.msc d5ab32cf30d6ba8b5ce20835b4042f6cc2a4cb39
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/config.guess 94cc57e2a3fdb9c235b362ace86d77e89d188cad x
- F autoconf/config.sub 1efb390a8fb4bfafd74783a15a8fb5311c84300e x
- F autoconf/configure.ac 9a65da17e440466f9842288163f16f9b21298129
- F autoconf/depcomp 0b26f101e3bc9fd1ff0be1da9fb4a82371142f92 x
- F autoconf/install-sh 06ee6336e63bb845c8439d777c32eb2eccc4fbf1 x
- F autoconf/ltmain.sh 7a658a24028f02331c1d2446562758083c5eadd1
- F autoconf/missing d7c9981a81af13370d4ed152b24c0a82b7028585 x
 -F autoconf/README.txt 7c31da66232f7590bb987cfcd4e2381744b25d24
++F autoconf/README.txt 7c31da66232f7590bb987cfcd4e2381744b25d24 w autoconf/README
+ F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
  F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
  F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -983,6 -982,7 +998,7 @@@ F test/savepoint4.test c8f8159ade6d2acd
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
  F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 -F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
++F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2 w test/savepoint3.test
  F test/scanstatus.test 5253c219e331318a437f436268e0e82345700285
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
@@@ -1338,9 -1344,10 +1360,10 @@@ F test/whereE.test b3a055eef928c992b0a3
  F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
  F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
  F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
- F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
+ F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
  F test/whereJ.test 55a3221706a7ab706293f17cc8f96da563bf0767
  F test/whereK.test f8e3cf26a8513ecc7f514f54df9f0572c046c42b
 -F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864
++F test/wherefault.test 1374c3aa198388925246475f84ad4cd5f9528864 w test/where8m.test
  F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
  F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
  F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
@@@ -1418,9 -1427,9 +1443,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
+ F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5c79f53131a7ab3c83f49e35a5021a6cdb2518fc 126b998cf163dcdd5a222634f1e929f04db3c700
- R 3aa36152d0afbf358fe2d9294f027d01
 -P 06f1495f4b7465e3992f524f56d97847643a9895
 -R b86f8e59b295e1048335bf96093b2d01
 -U dan
 -Z f9a2cc9c8dbe56018446b3f984094705
++P 8aede091c4740511d11ea14da253fe39bbfe75a6 a48ac4c347813bd2b416b1cb06c3cbf1f4b3781a
++R 580b69c1534293700c3568d992e6ddd2
 +U drh
- Z a2d9cb37921cba70bc9062c45a920229
++Z e274944a16c507edac9643474a14a944
diff --cc manifest.uuid
index b7d676b362,6f698efa34..7a642fa850
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8aede091c4740511d11ea14da253fe39bbfe75a6
 -a48ac4c347813bd2b416b1cb06c3cbf1f4b3781a
++f9e5fb88a5a14b26e9ea6997f449d0913f27a494