Merge coverage improvements and comment fixes from trunk.

FossilOrigin-Name: 58023bfccce40c611791c1963d47b620ffb9447a

diff --cc manifest
index 2d0336ad1ee90854e9bdf2a96524c7763991d22a,2807800e015e43a939585bffdf86209ad61687a6..584086a5bf2e526f3af9a2879d5dd235a1e46bd4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Fix\sa\stypo\sand\sremove\san\sunused\svariable\sfrom\stest\slogic.
- D 2016-03-07T21:28:41.826
 -C Fix\scomments\son\spager\sflag\ssettings\sto\sinclude\ssynchronous=EXTRA.
 -D 2016-03-08T13:56:02.581
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\scoverage\simprovements\sand\scomment\sfixes\sfrom\strunk.
++D 2016-03-08T14:01:52.135
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -335,11 -332,11 +335,11 @@@ F src/os.c 4bcb5173e2b51e254397fbed13ed
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
 -F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 +F src/os_unix.c 4547ba822e88bbbb4749730fb0825e8428485610
 +F src/os_win.c 390534cac9a3730d589241d4c452901bd2aaf7bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 47637146719cb936a8121e9e4c5f1adbde1765dc
 -F src/pager.c 17aa37b3b53a62a1bd98fe6f3c758bb41429ef08
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
++F src/pager.c 685c46484f2854c5e262bca3f2cb793564ae0a46
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
@@@ -353,11 -350,10 +353,11 @@@ F src/resolve.c b8f7174e5f8c33c44ded3a2
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/sqlite.h.in 427f02cf8a6e461c50f98a8663fd8f582e659456
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h e7468e1b1b69234a26a16918a0e02ac9d3e62a3c
 -F src/sqliteInt.h 4c7b8501b37eb768a5457b01cb9a9a5505f3fd85
++F src/sqliteInt.h 16201931b2ce79b80e9de3be6520cfd22a8f39a2
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -429,14 -425,14 +429,14 @@@ F src/vdbesort.c 307460bfa4de4d1c3901fc
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 0eaa33b32c3aa8e8d956cdd4693c4d8604966633
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c ccc62c39af1e6340f6af36fcf68efb96482d4c3a
+ F src/where.c dff52f7f0842430f80a7017c7859124685b08453
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
- F src/wherecode.c 870f3e92602f216701a14d3f26805caffbfb5c34
+ F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1459,7 -1454,7 +1459,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 84f09f00f8731b1b3e057bc629ec14103a44b81d
- R 59470dd87fbad08edd400a407c25e925
 -P 82ca2131b670505578628687746135ac413d156b
 -R 4e1de8a7b93ab084a5d8af152570ff89
++P 9f31516c5dd4a3578fb66d00425fb3e44d792716 3a65a1fc0fd2408c6984153801ec5dcd5211c897
++R 6c7d52d1d6603043ea540365231068b7
  U drh
- Z a14b7b830586a2141d82877f6e3294e0
 -Z 8d271451485b418fda3cdda213f61b81
++Z b23708b1ef3d7edf4a5630564fc6396f

diff --cc manifest.uuid
index f94a761bf4bc4f557884bf78260c5b4ccbd77fc3,9831ba312cb19746915e92a505235844cf5a1e7d..e6e42253db9a1626cd9ed44ddc9a7d8b5596a9ad
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9f31516c5dd4a3578fb66d00425fb3e44d792716
 -3a65a1fc0fd2408c6984153801ec5dcd5211c897
++58023bfccce40c611791c1963d47b620ffb9447a

diff --cc src/pager.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge