Merge enhancements from trunk, and in particular the TEMP file deferred I/O

enhancements.

FossilOrigin-Name: 81b76901e63d670c0f2302f56f1aeafcc7ff9922

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 7576435fdbde53f23721f3f8a826d71c9cf802a8,79ea0c73d4b7c11c3819da8c4c7a923212daca62..7b23056c8e511f1b21a22cc8843a1ea5ca9cb366
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2016-04-21T15:35:21.927
- F Makefile.in 2e92e1ae249f32660fb52f61de0f3b6844cfe7b9
 -C Postpone\sI/O\sassociated\swith\sTEMP\sfiles\sfor\sas\slong\sas\spossible,\swith\sthe\nhope\sthat\sthe\sI/O\scan\sultimately\sbe\savoided\scompletely.
 -D 2016-04-29T15:39:48.423
 -F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
++C Merge\senhancements\sfrom\strunk,\sand\sin\sparticular\sthe\sTEMP\sfile\sdeferred\sI/O\nenhancements.
++D 2016-04-29T15:52:58.135
++F Makefile.in c3d3154bf7fed85676ea6d758cc9c9048b52e750
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -246,11 -247,12 +247,12 @@@ F ext/rbu/rbufault3.test 54a399888ac4af
  F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
  F ext/rbu/rbuprogress.test 2023a7df2c523e3df1cb532eff811cda385a789a
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
- F ext/rbu/sqlite3rbu.c 9097f1d95666dbef72ca61d5b6a13a84660735ac
- F ext/rbu/sqlite3rbu.h d7cc99350c10134f358fe1a8997d9225b3f712b2
- F ext/rbu/test_rbu.c 3505641a78b723589b8780d5f9b2faeeb73e037d
+ F ext/rbu/rbuvacuum.test 66e02cf299836770e718e95c36686be0b26dbda3
+ F ext/rbu/sqlite3rbu.c bf36625990c6865ecf08bd844d8097ed2d0a6958
+ F ext/rbu/sqlite3rbu.h 2acd0a6344a6079de15c8dc9d84d3df83a665930
+ F ext/rbu/test_rbu.c 9bbdf6bd8efd58fbc4f192698df50569598fbb9e
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 0b870ccb7b58b734a2a8e1e2755a7c0ded070920
 +F ext/rtree/rtree.c 428878f7b016639149f6c95cef5741f835554765
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -289,14 -291,11 +291,14 @@@ F ext/session/sessionE.test e60a238c47f
  F ext/session/sessionF.test c2f178d4dfd723a5fd94a730ea2ccb44c669e3ce
  F ext/session/sessionG.test 01ef705096a9d3984eebdcca79807a211dee1b60
  F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596
- F ext/session/sessionfault.test d52cbb7bee48cc8ee80335e07eb72fcb6b15eb40
- F ext/session/sessionfault2.test ac1dfd77a0fb0ea310aee40a16645ef1b66d3f88
- F ext/session/sqlite3session.c beb300cd1b5c5054062c8e6e807b10475e363410
+ F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
+ F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
+ F ext/session/sqlite3session.c beb43b6b888801bb006320bc236baa95f4cc32ae
  F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d
  F ext/session/test_session.c 464f2c8bf502795d95969387eb8e93f68c513c15
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
@@@ -362,39 -361,38 +364,39 @@@ F src/os.c bb97ef31f4674b0bb57d13a98183
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 4e279d4164c0929648f20c7fd8aafae079fc8c32
- F src/os_win.c 8aeedf6a069b3d8e2acbc1c7077240085445d868
 -F src/os_unix.c 8422fba2eb592fbbb2d4006b6f2a67cad8951495
 -F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
++F src/os_unix.c 5b8248666530f217a6e7a0e79e6671e25bff1333
++F src/os_win.c b717a28c34e158dbd392b57ead178903e17968ce
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 1b5c2b76645d294825a8280e7e9996d44448e222
 -F src/pager.c a8d30c49c231e9a20d05257613db922532588963
 -F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
++F src/pager.c c02274c29feb73f909b6253cd89fa5f48dfe9627
 +F src/pager.h 7b85589162a781d75fb62c4750ba31ddce9500c5
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
- F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
- F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
- F src/pcache1.c dc4ad9b31cf603d14b3a90719f3aa874b4925137
+ F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
+ F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
 -F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
 -F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
++F src/pcache1.c 9c2f433344e345da87f944c66e54b9e3e5d49693
 +F src/pragma.c 985f16e7f14032c7e9638f7dc48c3384d17a6a4f
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
- F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 30217121bdf6b587462150b8ee9e1467f7a6036b
+ F src/rowset.c 49eb91c588a2bab36647368e031dc5b66928149d
+ F src/select.c fd4a7ce2937497181063cfedb92058ac89491a5d
  F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
 -F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
 +F src/sqlite.h.in 42b0c884153a175d4e5a1a45b5e404ea35379b06
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h 02f1f63a3cac598bf6ed6e08a2d042d933d6800d
 -F src/sqliteInt.h f4a53f3547dab80dc7db975fa1192d9bad1f38e8
++F src/sqliteInt.h 981577d9bbe03401b3a083c1dfbcf7cffa519a3e
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c a18cb6138b5d33b085e71136081ece72fc6d1bfc
 -F src/test1.c ee8fd5c32acb93fb6fe885ca4801cfab85f5563f
++F src/test1.c fae64f07c1767ddf9b11f4f7fa39baa7e70653f7
  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
@@@ -404,9 -402,9 +406,9 @@@ F src/test_backup.c 2e6e6a081870150f20c
  F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 7003f6f35134de6f19c6588f44783e43390ea277
 +F src/test_config.c 7711c82d42b9347540b6c8f628560055ff99b42a
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
- F src/test_devsym.c 7e73009d5297b603c11c66d7c7d6723d4b5c73e1
+ F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
  F src/test_func.c 37453d346cfcf118774efd5bf6187f7e6a7e3254
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
@@@ -428,8 -426,8 +430,8 @@@ F src/test_rtree.c 43fff4c5a01576d6d213
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
 -F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
- F src/test_syscall.c 4889d374f5a5856b7951f7a67c6401f7b938c6f5
+ F src/test_syscall.c 268c072541162564a882c57f54a6fee12ef4a4d2
  F src/test_tclvar.c d86412527da65468ee6fa1b8607c65d0af736bc4
  F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
  F src/test_vfs.c 4d02f38bfb8f7f273da7ba84bfe000f5babf206c
@@@ -443,12 -441,12 +445,12 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 187a0a2aaa3c5d2ccd2ab0143b2fd9e86d6bc816
+ F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 4c31c32772bcd87e075aa4f7d62b89095afaa73a
 -F src/vdbe.c 08fbea00a7f7f723973093c5f5bf7c40c025e2b3
++F src/vdbe.c ccc79856f9c70c2627c7219e51959e4b3e38142d
  F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
  F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 -F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeapi.c ded51c087af11b0d725720036ec12aea5140a6ee
  F src/vdbeaux.c ace1875da40b7185e604586768d5ac90de7e4f7f
  F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
  F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
@@@ -614,7 -612,7 +616,7 @@@ F test/ctime.test 7bd009071e242aac4f185
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
- F test/dbstatus2.test fc968d3005b4d827eba807a06573a6c528aa119a
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
++F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -646,10 -644,10 +648,10 @@@ F test/e_select2.test aceb80ab927d46fba
  F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10
  F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
  F test/e_uri.test 25385396082b67fd02ae0038b95a3b3575fe0519
- F test/e_vacuum.test 4d5b391384bb7d56bb9337d956f08035332421fc
+ F test/e_vacuum.test 120f29ea56bdce4d43279527ece894ab5d1729d3
 -F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
 +F test/e_wal.test 95c21e45eefe4cc31e820f998b14f92d1cb3a1bf
  F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 -F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
 +F test/e_walckpt.test 9f20ab843538484c57069074b126699266ee5521
  F test/e_walhook.test 4c0613a0c76e7a9d5c4c211e1b4cbcc1143914df
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
@@@ -658,10 -656,10 +660,10 @@@ F test/enc4.test c8f1ce3618508fd0909945
  F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
  F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 -F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
 +F test/exclusive.test ff85192dcf5000a1b53452a89fa9c5b61b0138cf
  F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
- F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
+ F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
  F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
@@@ -827,7 -825,7 +829,7 @@@ F test/incrblob_err.test 69f9247fed5027
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
  F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
- F test/incrvacuum2.test a1828b6165af6c248c4eb80aeaee2bcbb45768c1
 -F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
++F test/incrvacuum2.test 1e873b6caf87ce160d4cb6d8c7a46f0570da1ddc
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test fe3c7a1aad82af92623747e9c3f3aa94ccd51238
@@@ -864,8 -862,8 +866,8 @@@ F test/join4.test 1a352e4e267114444c292
  F test/join5.test 8a5c0be6f0c260a5c7177c3b8f07c7856141038a
  F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
  F test/journal1.test 69abc726c51b4a0409189f9a85191205297c0577
- F test/journal2.test ae06f566c28552c313ded3fee79a6c69e6d049b1
+ F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
 -F test/journal3.test ff8af941f9e06161d3db1b46bb9f965ff0e7f307
 +F test/journal3.test ef775301aa8c64c80efa859e6aa0207add921a93
  F test/jrnlmode.test 7864d59cf7f6e552b9b99ba0f38acd167edc10fa
  F test/jrnlmode2.test 81610545a4e6ed239ea8fa661891893385e23a1d
  F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
@@@ -971,19 -968,19 +973,19 @@@ F test/pager1.test 15d423765637d8cd54b0
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
- F test/pagerfault.test 3ae5dafba16772a2349af57ebc5549fcf14646b0
 -F test/pagerfault.test 42ff797b1e6426c141cc7ee8b7417c9f27427950
++F test/pagerfault.test 6b3f03fca89aacb4d1ca2c0216af114acaec0c66
  F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test cd1fa041074ed08eeaa563e4d1bacb0c69337ec1
- F test/pragma.test 2e34da1ddf98d69b94ca6bee8b1241a393d2ced2
+ F test/permutations.test b6b3e165fdc1b8c82a820033646dbfc6a7a01746
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
++F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  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
@@@ -1095,17 -1092,17 +1097,17 @@@ F test/spellfix3.test 0f9efaaa502a0e0a0
  F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
- F test/stat.test 688f0f9bca137ae95a6d237728064a7b7e31fded
+ F test/stat.test 66e95f97b9f724f9ab921d054ee0db3c2689f1ee
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 -F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 +F test/superlock.test c86eacd6cead5da9c5ecd25f3d46fca30a927ef2
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
- F test/sync.test 2f607e1821aa3af3c5c53b58835c05e511c95899
+ F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
  F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
  F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
  F test/tabfunc01.test f977868fa8bb7beb4b2072883190411653473906
@@@ -1113,10 -1110,12 +1115,12 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
+ F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
+ F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 4dd35afb8626386a8fef563388d6bb984f831557
 -F test/tester.tcl 30c7a9be8601d1c1c9c93d013545ebcb28d64254
++F test/tester.tcl 406a05a51747b0d9780aaad05c6eb3a00f857184
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1132,10 -1131,10 +1136,10 @@@ F test/threadtest4.c c1e67136ceb6c7ec81
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
  F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
- F test/tkt-2d1a5c67d.test 8f48335224537ac91aa16277a1d5a44c9fc1bb3d
 -F test/tkt-2d1a5c67d.test be1326f3061caec85085f4c9ee4490561ca037c0
++F test/tkt-2d1a5c67d.test 58a56653795d1787f4ed661f9da7da153b0dc3f9
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 6fb8807851964da0d24e942f2e19c7c705b9fb58
- F test/tkt-313723c356.test 54a1558d2719e171bd88967d66c73be4c617ec55
 -F test/tkt-313723c356.test 4b306ad45c736cedf2f5221f6155b92143244b6d
++F test/tkt-313723c356.test d78f772dd71d632f3d3f6d3d588c3105b2ab1bb3
  F test/tkt-385a5b56b9.test c0a06ada41d7f06b1686da0e718553f853771d1e
  F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
  F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
@@@ -1487,7 -1486,8 +1491,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 eef557449cf665aa8deb85674b7db167b389776a c4f165c460c4244ed434107feac005efa3c386cf
- R 2a8e53c1ce65650abbcbbce9eb4700f6
 -P 4cbd50245440e714935399a5c285cf32d8bfc424 b7bec7f2d3d08d0c14f77654be2c5cedf1619e58
 -R f9ef4e1af8653e902d9192ffb04cabc2
 -T +closed b7bec7f2d3d08d0c14f77654be2c5cedf1619e58
++P a15c49aed09a6f431022bc73aa98b04165649192 9d0a5ae00273686ea35b43bc2ffaa8775c176363
++R 7da8933ea701b90b2c17009a72176bef
  U drh
- Z b82cbfae826a457efa45f868b4061952
 -Z 20681342134be4241c18925dab8e4f41
++Z d8f4c0090b880980f62cef0bab3b783e

diff --cc manifest.uuid
index 223cde8f661a1c68a38dbeecdd6d589126cd3a1f,fc6b7bfe0572a3e23ab00484f2a1c5e1929e55af..130130bcde289b03a656363f0e3ffa066c42c78c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a15c49aed09a6f431022bc73aa98b04165649192
 -9d0a5ae00273686ea35b43bc2ffaa8775c176363
++81b76901e63d670c0f2302f56f1aeafcc7ff9922

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
index 063af5aa6dbef4c3985963d9d997f5e852855912,d24337cd50e5d758c71a42cb64f240b96199fe45..3f3814c9672836ff319200bc9a496ca39cc2345c
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -5576,16 -5589,17 +5612,20 @@@ static int pager_open_journal(Pager *pP
        if( pPager->journalMode==PAGER_JOURNALMODE_MEMORY ){
          sqlite3MemJournalOpen(pPager->jfd);
        }else{
-         const int flags =                   /* VFS flags to open journal file */
+         int flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
+         int nSpill;
+ 
 +#if SQLITE_ENABLE_DATA_PROTECTION
-           (pPager->vfsFlags&SQLITE_OPEN_FILEPROTECTION_MASK)|
++        flags |= (pPager->vfsFlags&SQLITE_OPEN_FILEPROTECTION_MASK)|
 +#endif
-           SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|
-           (pPager->tempFile ? 
-             (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL):
-             (SQLITE_OPEN_MAIN_JOURNAL)
-           );
- 
+         if( pPager->tempFile ){
+           flags |= (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL);
+           nSpill = sqlite3Config.nStmtSpill;
+         }else{
+           flags |= SQLITE_OPEN_MAIN_JOURNAL;
+           nSpill = jrnlBufferSize(pPager);
+         }
+           
          /* Verify that the database still has the same name as it did when
          ** it was originally opened. */
          rc = databaseIsUnmoved(pPager);

diff --cc src/pcache1.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/dbstatus2.test
Simple merge

diff --cc test/incrvacuum2.test
index 6f1fb1e871ce2aab22bdbe031362e21da5c3a6d5,6ec66c9debc51b5e4895560d8cf285cafda2e514..1017637876a821bbf4e0f5a8fdc78ca68572dfdf
--- 1/test/incrvacuum2.test
--- 2/test/incrvacuum2.test
+++ b/test/incrvacuum2.test
@@@ -135,9 -134,7 +135,9 @@@ do_test incrvacuum2-3.2 
  
  integrity_check incrvacuum2-3.3
  
- ifcapable wal {
 +if ![wal_is_ok] { finish_test; return }
 +
+ if {[wal_is_capable]} {
    # At one point, when a specific page was being extracted from the b-tree
    # free-list (e.g. during an incremental-vacuum), all trunk pages that
    # occurred before the specific page in the free-list trunk were being

diff --cc test/pagerfault.test
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/tkt-2d1a5c67d.test
index 442c85d3813d39587f44a6eaab37eba359f9566d,0d12a6ec43e804a2e53ead999698b5ab4e43f7d0..4cbc1f18bbf29364e664cb4cd107eda2326d54d5
--- 1/test/tkt-2d1a5c67d.test
--- 2/test/tkt-2d1a5c67d.test
+++ b/test/tkt-2d1a5c67d.test
@@@ -19,8 -19,8 +19,9 @@@ set testdir [file dirname $argv0
  source $testdir/tester.tcl
  set testprefix tkt-2d1a5c67d
  
- ifcapable {!wal || !vtab} {finish_test; return}
+ ifcapable {!vtab} {finish_test; return}
+ if {[wal_is_capable]==0} {finish_test; return}
 +if {![wal_is_ok]} {finish_test; return}
  
  for {set ii 1} {$ii<=10} {incr ii} {
    do_test tkt-2d1a5c67d.1.$ii {

diff --cc test/tkt-313723c356.test
index 2f3de34abd3b57031dfe0d97b14b84a72a6eb8a3,5325fd229219b7d30996b502dacbd8f48cf89a2c..c1146b2979a8cabab82c5a0ca3647eb7028568f3
--- 1/test/tkt-313723c356.test
--- 2/test/tkt-313723c356.test
+++ b/test/tkt-313723c356.test
@@@ -18,8 -18,7 +18,8 @@@ set testdir [file dirname $argv0
  source $testdir/tester.tcl
  source $testdir/malloc_common.tcl
  
- ifcapable !wal { finish_test ; return }
+ if {![wal_is_capable]} { finish_test ; return }
 +if ![wal_is_ok] { finish_test; return }
  
  do_execsql_test tkt-313723c356.1 {
    PRAGMA page_size = 1024;