Merge recent enhancements and fixes from trunk.

FossilOrigin-Name: 5429f99b98ea1e2ecf5f50dade52009adc431a12

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index eeb44b970f659c63209e4fcdfe92ea5367357d5d,782863019bb33593fb7e64a060590d88227d68bb..9b16325789f59e32061a2d182172581390f34e21
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\slatest\strunk\schanges,\sincluding\sthe\sfollow-symlinks\sfunctionality\sand\s3.9.2\sbugfixes,\sinto\sthis\sbranch.
- D 2015-11-02T15:10:48.109
- F Makefile.in 3f4e9157bfb231338d7625610806599e4beb31b7
 -C The\sOPFLAG_SEEKEQ\soptimization\sis\sonly\sapplicable\sto\sequality\scomparisons\nagainst\san\sindex,\snot\sagainst\sa\srowid\stable.
 -D 2015-11-07T01:19:00.997
 -F Makefile.in 3a705bb4bd12e194212ddbdbf068310d17153cdb
++C Merge\srecent\senhancements\sand\sfixes\sfrom\strunk.
++D 2015-11-07T01:57:44.199
++F Makefile.in 80f55546139f0123c9988d8c483270ca05e58bdc
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -266,7 -263,7 +266,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk c7f84d8f3ea251491fb5d6a5774c659c3ec0c322
 -F main.mk ac9746f24334056c85775dbe6b7279b84a6941d7
++F main.mk 7c1776a0c3ab9ae4623cfb36ab63ccc7ebd54615
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -282,12 -279,12 +282,12 @@@ F src/alter.c 9d649e46c780166e416fb11db
  F src/analyze.c 4c308880cf53c558070cb8513bdff4ffb1a38a77
  F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
+ F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 35af7ace61d9db9c93b6608fa635c3929bc28dae
- F src/btree.h b512723e4f27d7ba16b4b985cdecdb82c0f6d0c0
- F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/btree.c 9e5d713bf54be8bfcae9b60210173dd53570f56d
++F src/btree.c 5e5316b3c6f942c295b51b87cffc79d0206af0d9
+ F src/btree.h 1b8bf2818b5e256c25a5e09126720113b1d783da
+ F src/btreeInt.h 3ab435ed27adea54d040584b0bcc488ee7db1e38
  F src/build.c ca574d33ffb1763cfd2979383f4d507095bfbe19
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
@@@ -327,11 -324,11 +327,11 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c cf72e06e15839ebe7121e01d3eebf256c039b0ca
 -F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
 +F src/os_unix.c 93f3106e2a4f16d9c50fe4decaeddba8ad3d9fb4
 +F src/os_win.c 1666013b5b107c70f703abece20e0e2f2137d6bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c b35877e335c9bdf9974a752d638bbfa64ed0cf31
- F src/pager.h 33a0e40fa4841096a8443d2337ca8151b6402ec5
 -F src/pager.c ed5cff11793b6a4146582aabb29ed8613a6cf89e
 -F src/pager.h 7fc069c07f3120ee466ff3d48a9d376974ebffa7
++F src/pager.c 681ed822a9ce2aed138cca026a4ef8942e4eacba
++F src/pager.h 86484ef4aa3cbb8fe7a8a2ddcf770ba0c76757e2
  F src/parse.y 11078cd8e3af00f030505b6a86a06a4536cfdeaa
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
@@@ -345,17 -342,16 +345,17 @@@ F src/resolve.c 1954a0f01bf65d78d7d559a
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
 -F src/sqlite.h.in 3cfc86c55e57c63d86b9e1e92869e2bfb162ca8e
 +F src/sqlite.h.in 472ebb1316087b87e27f13c9465de5e788ae2a66
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 72eeb2eb3b62e312299cc4597dc0ebaa066182c1
 -F src/sqliteInt.h 12ff325b433c4ded39995b74b01b78aacc19805a
++F src/sqliteInt.h 2f6f0e90f54f3cd030be687199add9f30fa16532
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c 620531c662fa0a35fab85d6e7f73091aaefd3c87
- F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
 -F src/test1.c a719afff3144f7f01c6dc3f7d118ac31d15e7527
++F src/test1.c 33e6b76796736fc16cc809dbb25c955318753c05
+ F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
@@@ -407,11 -403,11 +407,11 @@@ F src/update.c 40e51cd0883cb5bfd6abb7d8
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c b8606b0a9b15e857a67174dcec6c7f984c327136
 -F src/vdbe.c 7a9b18027414368d800716e6319e2acd699c70db
++F src/vdbe.c c9869b29ad815472a1548b6772d0b26cb6976180
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 6d55530b05b69bc663c87d2d258318dcdf042644
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c 0e5a83f4dba6ef2978c2852aa8e1e20713b7d1b7
++F src/vdbeaux.c 4b4bda5ee2125c742c0263bfbbb0e95e52116387
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
@@@ -457,11 -453,11 +457,11 @@@ F test/async2.test c0a9bd20816d7d6a2cec
  F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
- F test/atof1.test 08a61df9365c341f334a65f4348897312d8f3db7
+ F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
 -F test/attach.test 437107943f14d131cf5efc2ae5305a94d7cb1d58
 +F test/attach.test 1e7275728d68631627ab3b81fa48d1fef22796ef
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test 855233ef26eb3601b6886567ea4e326c72959360
  F test/auth2.test 264c6af53cad9aba5218c68bbe18036e39007bfa
@@@ -930,11 -927,11 +932,11 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  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 ac3b00c299250cc087d4a527b5c75a0f8aef4e54
+ F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 -F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
 +F test/pragma.test fc0c3c0ca53ad82b32c02db7000c1c6ba4449fce
  F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1279,37 -1276,37 +1281,37 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 2ab8e490afe0164bfc89b185c8b2572e0d821f23
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test d10d42349df5e42cc930c0a85932cb566dddcc34
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
- F test/where.test 66d4c107e82dfe86c01a96277b77e7a8809aff0b
+ F test/where.test 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
- F test/where4.test 44f506bf1737cf0fa4fc795e340208250f1fcd89
+ F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
  F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
@@@ -1403,7 -1400,7 +1405,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 980d6207431abf8549bf8dd82d65d707872a2a31 6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
- R fde5af0611dc784cf3991905e6210e7a
- U dan
- Z 8e194ed9f95c627829ea2eb87bbc0fd8
 -P dd9a26ecdeaef7b0b9cbf4ff70448ab13a276b4e
 -R 37fd8f25666e5cc61c467cdb94b7bb71
++P 447521d747d94fa3028348bc48b897592fd8021c 0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
++R 01a4b895013e0ddf07a1438acec26883
+ U drh
 -Z b3bf4f06c783a2156de71d3cb1963976
++Z 74d3bc6036689b4e3991ad6c9e774d5d

diff --cc manifest.uuid
index 316f7c527d90e73081c7ac547bb0dcd1b7ccdc53,f7a057f393aabee2cf6f57abf6df920f928839ab..d171dd39617522864a81cd0cc19f80fd4d74d50f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 447521d747d94fa3028348bc48b897592fd8021c
 -0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
++5429f99b98ea1e2ecf5f50dade52009adc431a12

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
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 src/vdbeaux.c
Simple merge