Merge changes from trunk.

FossilOrigin-Name: 5294c977d9b15a4f29028782ef253329bd739fc0

diff --cc manifest
index 4997303fa7a025c6ae9a3392dc59db901c56b815,5e68a8f7a248c7831fc4eafb99107ba5d0c60468..0f7618522692f28caaa1689c1465cf192706b03d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Change\sthe\sestimated\srow\scounts\sin\sstat1\sto\sbe\sone-third\sworst-case\sand\ntwo-threads\saverage\scase.
- D 2016-03-01T14:31:59.247
- F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 -C Defer\sopening\sand\swriting\sstatement\sjournals\suntil\sthe\ssize\sreaches\sa\nthreshold\s(currently\s64KiB).
 -D 2016-03-04T14:43:44.681
++C Merge\schanges\sfrom\strunk.
++D 2016-03-04T18:45:12.274
+ F Makefile.in ead489fe5d3313b8a2a8d5f3710173a4b50dd2e0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 4f319afb7c049d40aff7af6e8c4e7cc2ba18e079
+ F Makefile.msc d68db8ddac21ea2576ea5b446f12cf9ebe897a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -285,8 -285,8 +285,8 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 44e18dfd78e8942d65d3cdaec4de972b5cd9f1f2
+ F src/alter.c 1bb0709b3048e24217b80ec6bd78a3e99a47c01b
 -F src/analyze.c ab57b6763dd4c6170a20673d14882c033affd188
 +F src/analyze.c dac2f49d4a622091df1964a9ec9de1d2cd0584bb
  F src/attach.c a3724c64de1099d85e30751213d285752aed9505
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
@@@ -354,11 -354,11 +354,11 @@@ F src/shell.c 5e0ab1e708dc294330ccd8230
  F src/sqlite.h.in 57d2a02b14c9ec4f7cb294153eaf62294dc5aa68
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h e05c48a2b90836452d47d03b2c90a7b7ec9f8ba4
- F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 -F src/sqliteInt.h 8a4810fa90b17eb08acab43649b877e894ea1e98
++F src/sqliteInt.h 7d1257c165974c64d4715d80ee1122aba4578b4e
+ F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 13debcc6a5ca1217486f8903768c01114fbe8b58
+ F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e
  F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
@@@ -428,9 -429,9 +429,9 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 2786a5f385dedd67e9cedaa00645bf44444f3c68
 -F src/where.c 56948ada5aacc3bf2628db3776986e8bf4085383
++F src/where.c 2b61974a8442f2c7afb3905322b56d3d618d2804
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
- F src/wherecode.c 39c1ef4598bedf1d66249334c74efd23ddd182ac
+ F src/wherecode.c 3ca820435c5b597bb50e63ed11e938786fe5c23e
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1451,7 -1453,8 +1453,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 810967bff6ba262f38a2833e2d4efef4ef00f463
- R cd9cc1e55f6145b7b1e4855011dd5873
 -P 2682e8e413fadbca0673f242769af17bfd291559 5b2fe5219ab9ad15969e3374894a75979b65cb3c
 -R bcfeac6deb0b24b3190e8b427e406c58
 -T +closed 5b2fe5219ab9ad15969e3374894a75979b65cb3c
++P 21bfd47c4245846b12aeeb7cf0212529e300b878 cb9302cca423de41305719a49208daa392ec09da
++R 636b0403188c11b543ab3d2b973ee377
  U drh
- Z 85196c62dcaae63dbb4c33e57a54153c
 -Z 04f483c25715ded0ed1694d083bfc434
++Z 61c960fff1efcb39fcf10879f7f27e05

diff --cc manifest.uuid
index 6c06608fd701760eb7f3174a3019e3d879fffcf4,68d02d516aa0006f10c37e94ce3811489b352ee7..c6b79347aab32931a8c255c24e133d37c20d8113
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 21bfd47c4245846b12aeeb7cf0212529e300b878
 -cb9302cca423de41305719a49208daa392ec09da
++5294c977d9b15a4f29028782ef253329bd739fc0

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge