Merge recent fixes from trunk.

FossilOrigin-Name: 0d9b82afeadf3d8d8ca2aacd3620717e773ebe30

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 54e6c9e08dd2c776214e23f79f43db90db03e5dd,f2eb278bdd1f45fa33eddc505904c0d8b40e77b2..ae088db17de9ce045820da06fc2f0732295d7c16
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sthe\sbuild\swhen\sSQLITE_ENABLE_DATA_PROTECTION\sis\sdefined.
- D 2016-05-03T02:43:50.717
- F Makefile.in c3d3154bf7fed85676ea6d758cc9c9048b52e750
 -C Disable\sshell.exe\stest\scases\sfor\sUTF8\sfilenames\sas\sthey\sdo\snot\swork\son\sMinGW.
 -D 2016-05-16T11:55:09.207
 -F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
++C Merge\srecent\sfixes\sfrom\strunk.
++D 2016-05-16T13:37:45.139
++F Makefile.in cedd9f645b2b7f4fa69b7a3c39bad127db54332c
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
+ F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -293,19 -293,16 +293,19 @@@ F ext/session/sessionG.test 01ef705096a
  F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596
  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/sqlite3session.c 37485891b4add26cf61495df193c419f36556a32
+ F ext/session/sqlite3session.h 69bf73cfd71e58f2ae5d2aa935b2c1a541aee555
  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
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 66df81fee9459eab305ba09f95acf5457d1a7c55
 -F main.mk 86e6a8d79186ace5ff8b306093da1728d953f796
++F main.mk 30f9a015718d5b7da9a411e37c01503b202d98a0
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -324,10 -321,10 +324,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 134f1b049d65b6598542bc2a2c209c6d38b5f239
 -F src/btree.c e53a01547d61a3d567daf7a7acc30122fe071aef
++F src/btree.c 57540cfb663ed64102d91e548600bbf3530f7ac3
  F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 42e8ee74dfa3a4b99bfb2c201f8a66ab50688d95
+ F src/build.c d65be62254ca9df36e1e1c433324f0333f80009c
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -364,34 -361,33 +364,34 @@@ 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 a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 -F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
 +F src/os_unix.c defa2c6c6e01219459fa783d2f55841271c4eebc
 +F src/os_win.c b717a28c34e158dbd392b57ead178903e17968ce
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c c93fda2f27f84afb21117c34ae397b5fabcfec3e
 -F src/pager.c 3910579bfbe323dfabed2b95d201159b61b8ef42
 -F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
++F src/pager.c 209bc67e793a4fd679d29f3b3a989b29acbe5922
 +F src/pager.h 7b85589162a781d75fb62c4750ba31ddce9500c5
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
- F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
- F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
+ F src/pcache.c f398c0084399e7481482cbc6a578a3cc4c3675f3
+ F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -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/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
+ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  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 981577d9bbe03401b3a083c1dfbcf7cffa519a3e
 -F src/sqliteInt.h 4fe51e4e26d9d576040198cef4f78df3d987387d
++F src/sqliteInt.h 39f288c10f1b0da66c402856108240e928bf3c01
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c fae64f07c1767ddf9b11f4f7fa39baa7e70653f7
 -F src/test1.c c0e5b69f99e95a2c9f55fdb6e46b44f1a15292d8
++F src/test1.c 59591879bed010df4b08f500f11318f2b5539784
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c 0df6f8dbb4cbaa7106397c70a271fa6a43659042
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -458,14 -454,14 +458,14 @@@ F src/vdbesort.c 0a8f98366ae794442e6d1e
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 4db22ed7e77bcf672b1a685d6ddeffba8d5be302
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 5c7bde7a5f29c6321a66804210fd3b73aeb74aad
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 019e5b10dedcf54ef077ce23dd8fce38d614dcf4
+ F src/where.c fd321cc2c5ee346a2e146b93892ed01bb7a839c0
  F src/whereInt.h 3b1fc240e322613ba4e9dc857ca9c7c3390acc74
- F src/wherecode.c 28951741be3974701186281ced0564e9586a0db3
+ F src/wherecode.c 23fc19ca546ce323ba5c4be96b88e3ba08cf6b8f
  F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
 -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
@@@ -1115,12 -1110,14 +1115,14 @@@ 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/tempdb2.test 4fc92055f2a3f7626c0f2eabbb637dc021b311d5
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
- F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee
+ F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
+ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 -F test/tester.tcl 3ace46dee55f07e28a1e3ab03258b929fefcee5b
 +F test/tester.tcl a9f62aaa93c912483a5103ecaca109396fe5aa77
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1491,7 -1488,7 +1493,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 f52765ee7bddf047ce32d7448ee0c409e27d349a
- R 4d12f454d1c2823bac7a9bcdbe3bca5d
 -P b369980f0c4550a9034833caa2c7c85d6030f5ff
 -R d8533b8fd6cbe0fbe7678e18e240aa96
++P 8f05e1402d0d26684bd15ffdb638d0a55abdce7f 386bcbba8ed733ee84958e6bd6e9d33c150e6c18
++R a0d6d0c4c60514e7f3fa80e6f182075c
  U drh
- Z 8daef19354af3f45cf84a317710b2669
 -Z 2e128c8e8599dacb44997bdb31a5993e
++Z 334b8a7964c01abfb38e9e36fc4cfb06

diff --cc manifest.uuid
index 9806d4a30ef812c9a47a7616843f4dbb7642821c,0837743ae1860fd6df10dec867eb32fd20a77ba7..a7eb12c45e03c626554fa7b0ec3f9f544fbf65dd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8f05e1402d0d26684bd15ffdb638d0a55abdce7f
 -386bcbba8ed733ee84958e6bd6e9d33c150e6c18
++0d9b82afeadf3d8d8ca2aacd3620717e773ebe30

diff --cc src/btree.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge