Merge changes from trunk.

FossilOrigin-Name: a87305dfd49ee17632d0bce66ce7c2e9407b7b3e

diff --cc manifest
index 9f2d2fdb746dc267400a17b255afb31aaca44ef2,d39a07ce5cc98a006fa9a43cfaedb2feb82cdec6..58b8efaa399e67a4f19eb46f5619ce55d88ab1e6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Get\sin-memory\ssubjournals\sworking\sfor\sbuilds\swithout\sSQLITE_ENABLE_ATOMIC_WRITE.
- D 2016-03-04T00:13:29.040
- F Makefile.in e335453db0b16da00c884ad51bb56d1c091a74de
 -C Change\sthe\sdefault\scache_size\sto\s-2000\s(which\smeans\s2000*1024\sbytes\nindependent\sof\spage_size).
 -D 2016-03-04T04:01:43.190
++C Merge\schanges\sfrom\strunk.
++D 2016-03-04T13:08:35.636
+ F Makefile.in ead489fe5d3313b8a2a8d5f3710173a4b50dd2e0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc dbd4621ecc585c2ef0c2aa0874698c54675754f1
+ F Makefile.msc d68db8ddac21ea2576ea5b446f12cf9ebe897a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -333,10 -333,10 +333,10 @@@ F src/os.c f89e3ca1c2e3d5015b847aec6037
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 3a6f20736dfb8a0949cdd66553fdf59f6604be35
+ F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
  F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c d034c69b958c01289eb8070cbf902e1a68cd7e0b
 +F src/pager.c 2bc43817697b5a4e88fd6a2cdb2cb25f2223505c
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
@@@ -354,8 -354,8 +354,8 @@@ 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 8aa9992cb35289ede0946f7ba8e993070e040fc4
 +F src/sqliteInt.h 8a4810fa90b17eb08acab43649b877e894ea1e98
- F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
+ F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e
@@@ -1453,7 -1453,7 +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 55c00f716dc98b188c91f3a5a010242c9497785f
- R 9e3fbc3007cf6215e63dd7896623508e
 -P 2e8a9ca9d3d6efddc31f01074d14acae56568c37
 -R bce4d7ea1e35eefbc9f3bc83f2294e5c
++P b5378dcea53d4cd1744d13ddee5e50869607b771 2682e8e413fadbca0673f242769af17bfd291559
++R 1d5f238c78a751f41b8ce4e327b6fc98
  U drh
- Z 727109808ff36a69d33c43dee6d82c50
 -Z 8be75f8161fe6fe960ec420b19540c0b
++Z 35e5851abb6d53f81aa001148a407eb0

diff --cc manifest.uuid
index 7f1e0b5ee4c3c947e42eccc0462a1ad379a1a2e9,0d4fa9e4a96c4a16713d2042c18c86d893fa1238..7ae252503c7a13b67817c28aa846d517a7c5e38e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5378dcea53d4cd1744d13ddee5e50869607b771
 -2682e8e413fadbca0673f242769af17bfd291559
++a87305dfd49ee17632d0bce66ce7c2e9407b7b3e