Merge latest trunk changes, including test case fixes, with this branch.

FossilOrigin-Name: 99794aca7b6cb40f08ce4db9889a989fc597eac9

diff --cc manifest
index 45d249293336e0822078ecc084c73776fbd828fa,85cf27f2cedad49974b13936dbac40161a55abc6..c04f4869ed5d1767f28bfd9a68c81349d0053fdd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scouple\sof\stest\sscript\sproblems\son\sthis\sbranch.\sBoth\srelated\sto\sthe\sfact\sthat\stemp\sdatabase\spage\ssizes\scan\sno\slonger\sbe\schanged\sby\sVACUUM\sor\sthe\sbackup\sAPI\safter\sthe\stemp\sdb\sis\spopulated.
- D 2016-04-27T11:24:42.387
 -C Modify\sthe\spermutations.test\sscript\sso\sas\sto\sset\sany\spermutation\sspecific\sconfiguration\svalues\sbefore\srunning\seach\sindividual\stest\sscript.\sFix\sa\smostly\sharmless\sbuffer\soverread\sin\sthe\ssessions\smodule.
 -D 2016-04-29T11:33:58.662
++C Merge\slatest\strunk\schanges,\sincluding\stest\scase\sfixes,\swith\sthis\sbranch.
++D 2016-04-29T11:35:28.485
  F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -361,15 -361,15 +361,15 @@@ F src/os.c 4d83917f072ad958fba9235136fa
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 2488a2b6456709ad6398df2302d427a980e2695a
- F src/os_win.c 1997a873bfc8296a701bd8e2df8c3d5da5afe956
+ F src/os_unix.c 8422fba2eb592fbbb2d4006b6f2a67cad8951495
+ F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c d20fa46d5beda38095be6070dd4c59e502817c72
 +F src/pager.c a8d30c49c231e9a20d05257613db922532588963
  F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 -F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 +F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
 +F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
- F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
+ F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
@@@ -387,12 -387,12 +387,12 @@@ F src/sqliteLimit.h c0373387c287c8d0932
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c abc10e3e81258835aeb59616685d7369ba99ad1e
+ F src/test1.c ee8fd5c32acb93fb6fe885ca4801cfab85f5563f
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
 -F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
 +F src/test3.c 0df6f8dbb4cbaa7106397c70a271fa6a43659042
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
- F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
+ F src/test6.c 2c014d4977efd6107ec9eef3dfdec56ac516f824
  F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
  F src/test8.c fa262391d3edea6490a71bfaa8fed477ccbbac75
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@@ -977,10 -977,10 +977,10 @@@ F test/parser1.test 222b5cbf3e2e659fec1
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test cd1fa041074ed08eeaa563e4d1bacb0c69337ec1
+ F test/permutations.test b6b3e165fdc1b8c82a820033646dbfc6a7a01746
 -F test/pragma.test dd5313eee9c6d9d4726593a68ede8768d3b50ccc
 +F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
- F test/pragma3.test 3f1984a04657331f838df5c519b443c2088df922
+ F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1111,11 -1111,9 +1111,11 @@@ F test/tableapi.test 2674633fa95d80da91
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
  F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 +F test/temptable2.test d4e967c355b154e8bc387de961430e94c20f2dca
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 7b740ee852c55e1e72b6ebe5044acee7aa4e5553
+ F test/tester.tcl 30c7a9be8601d1c1c9c93d013545ebcb28d64254
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1486,7 -1484,8 +1486,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 e790aac02e4b427b4891b514a050699d159b03b1
- R 167ee4a4f32b4f8204918ef34f7c21ee
 -P 4792d6dbba6857f74d27332dcc1468e39c767c71 89b0ee3351381f7bc666cb206f77a56f2e0d4a0e
 -R 96866ed68b53e21043adf38fe4b23f76
 -T +closed 89b0ee3351381f7bc666cb206f77a56f2e0d4a0e
++P 6bb5aa2be2a6c5ca66a98a9387b2845507a6bdd2 4cbd50245440e714935399a5c285cf32d8bfc424
++R 7ae3c477f36afa854d04f85029639199
  U dan
- Z bbfd58a46d92c2867a1001ebb15e237d
 -Z 9ea5c0c266312c18cafe76aed2353dcd
++Z 1ae9b89d9de363b516966d4d50de5d49

diff --cc manifest.uuid
index eadf0ef5a0b5502a3efddbb9fa2c9f0bf85bfeec,fd1017cb84e47c8c6dd791ea70e4583569595bda..e7c3b7b953317cf2c33237db6889c69241075339
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6bb5aa2be2a6c5ca66a98a9387b2845507a6bdd2
 -4cbd50245440e714935399a5c285cf32d8bfc424
++99794aca7b6cb40f08ce4db9889a989fc597eac9