Merge the master-journal optimization and other recent changes from trunk.

FossilOrigin-Name: 18c3ab4784a4efab2cc583ef712c4db9d127418a

diff --cc manifest
index d511052fea36434c13133bcefa6543ccd1f4eb39,ee2216461326346a7fe0f461fc237414840ca6eb..4bd7a5b4ad60cdacfb86a8354b7810c4d3c8ea9e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\stokenizer\sbuffer\soverrun\sbug-fix\sfrom\strunk.
- D 2016-02-18T14:53:52.680
 -C Always\suse\sthe\ssqlite3VdbeDeleteAuxdata()\sroutine\sfor\sclearing\sauxdata\son\nfunction\sparameter,\srather\sthan\shaving\sa\sseparate\sdeleteAuxdataFromFrame()\nfor\sdoing\sthe\sjob\sfor\strigger\sframes.
 -D 2016-02-22T16:04:31.519
 -F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
++C Merge\sthe\smaster-journal\soptimization\sand\sother\srecent\schanges\sfrom\strunk.
++D 2016-02-22T16:32:39.845
 +F Makefile.in 6bc82e8fca16b46e6158b5614f16b68cc42cbe5d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
+ F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -315,9 -312,9 +315,9 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 9ca97272e9f74ed0efddf3b4350ee12740cebbef
  F src/journal.c fe3a3e2559ce3ce9d371afd30fbabbc074174575
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c 90ad20c8c273beab61b49e452d2512807e16c408
 -F src/main.c d7415cd68121ef24c2e76b9e81ec96ffc90e6517
++F src/main.c be25ea1336aa4e9a24deb74aea6e08399815ffd8
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -363,7 -359,7 +363,7 @@@ F src/sqliteLimit.h 216557999cb45f2e357
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 13debcc6a5ca1217486f8903768c01114fbe8b58
- F src/test1.c f51730220589f17d95dbd6f821e1cb6377d4554c
 -F src/test1.c 8b17b1ff53aad71e7f9318a2fda247beddeaa601
++F src/test1.c 46a689306f959e32164d9043f79e5db8495336f6
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -375,9 -371,9 +375,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
+ F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 7985332c806d1cece793475c75a6abcccde9d331
 +F src/test_config.c 9f96e204b38ef8b1fbbe29565f731f4bf1811152
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -416,16 -412,16 +416,16 @@@ F src/treeview.c dc39ccf04e9331237388b9
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 8073bbdab9cc7209f6741bd44264ede606cbadc6
+ F src/util.c 38c06684c922694809ccb988a13562c16890a3d5
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c af2233589dbef9112923d7954a26fe5418926e65
 -F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
++F src/vdbe.c 5c09ebeb5d59ca587e0c1d23cdbcddd99864bfe5
  F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
- F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79
+ F src/vdbeInt.h 84827a809229917fdd3cc05af719dbb61314a5a3
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
- F src/vdbeaux.c 3580de0325a05663195d8f8fddf48c6dd9a28522
+ F src/vdbeaux.c 9583c5c05a75feb699591c9f24e4750def6537fb
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c be8381ed6de54eb9cb9dfa802823cdeb5166d855
- F src/vdbesort.c 74c22db608649fd7ed2d19d53eefb6efb14e9ee0
+ F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c c27c0232bbc6bd4b50320ea0ef988334cde7d1ca
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
@@@ -435,8 -431,8 +435,8 @@@ F src/walker.c 0f142b5bd3ed2041fc52d773
  F src/where.c 5b67fb8035ae4697cf721db095f800ef8dff5f56
  F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c 791a784bbf8749d560fdb0b990b607bc4f44a38d
- F src/whereexpr.c de117970b29471177a6901d60ad83a194671dc03
+ 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
@@@ -937,7 -932,7 +937,7 @@@ F test/orderby8.test 23ef1a5d72bd3adcc2
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
- F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
 -F test/pager1.test f49df1a8b0e38b9ee3a7dd2ab4d427507b7314ce
++F test/pager1.test c92c8acdc5675e85a06db43e4b5dca0fe9e3a374
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1397,10 -1393,10 +1398,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
  F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl fbeb0af7cffdf64e0fba6d65e2e5120dc14595f4
+ F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
@@@ -1433,7 -1429,7 +1434,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P b7fa0fb3399ad2bf1e6bc4c92d43278a40f19ec4 2a8d97e7c8976df0312e1294e8c1da8b15686654
- R 3b3ae438d780007f8a2e7756894326a0
 -P 3ed1890612bd45bd9c72f670d2cbb0b8fbd35d92
 -R 087e6cf717ab51d03c5c0e76eb47f593
++P 82e7e31b09097b24876f69df56cdd8f4c1aad1f1 64386fa339adb91439da979d74062f67a6ec68fd
++R 9fed06e98eafd73de0f2f0b839b0c312
  U drh
- Z cfd5f751bd276f78bb0a099814d00ed5
 -Z ce8b779f1a9ea7c56d4a99bdf5d3c13f
++Z bc58b8b56c1715f0445b9b0351cec5be

diff --cc manifest.uuid
index 207934484f49754c83b5690e3b4931e8468eec05,e6907d43a9390ed2c6b02d0c036d9473fdf69b9d..9366cc217cf39fb0a41106b86d131bb850b83d23
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 82e7e31b09097b24876f69df56cdd8f4c1aad1f1
 -64386fa339adb91439da979d74062f67a6ec68fd
++18c3ab4784a4efab2cc583ef712c4db9d127418a

diff --cc src/main.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/pager1.test
index 5c48ac405988945d70f77894fb53c3ddacaa337c,bc9ad83fd46541a1bd7214d3c6691b5e8213ab4c..6cfc15d4504bb1855b2077c71f80fcb2690d0453
--- 1/test/pager1.test
--- 2/test/pager1.test
+++ b/test/pager1.test
@@@ -679,9 -734,7 +736,8 @@@ foreach {tn1 tcl} 
  db close
  tv delete
  forcedelete $dirname
 +}
  
- 
  # Set up a VFS to make a copy of the file-system just before deleting a
  # journal file to commit a transaction. The transaction modifies exactly
  # two database pages (and page 1 - the change counter).