From: drh <drh@noemail.net>
Date: Wed, 13 Apr 2016 16:02:28 +0000 (+0000)
Subject: Merge enhancements from trunk.
X-Git-Tag: version-3.13.0~53^2~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ftempfiles-lazy-open;p=thirdparty%2Fsqlite.git

Merge enhancements from trunk.

FossilOrigin-Name: e2edd34e79af906e7069e3e837730b12de0b73fe
---

8ca7b177bbab06159f3e8d4a1eef594dabd3980d
diff --cc manifest
index 1f71471219,967ecce51b..3c58352a59
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Once\sa\stemporary\sdatabase\sfile\shas\sbeen\sopened,\sflush\sall\sdirty\spages\sto\sdisk\swhen\scomitting\sa\stransaction.
- D 2016-04-12T19:09:29.339
 -C Fixes\sfor\sharmless\scompiler\swarnings.
 -D 2016-04-13T15:52:16.297
++C Merge\senhancements\sfrom\strunk.
++D 2016-04-13T16:02:28.035
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -360,12 -360,12 +360,12 @@@ F src/os.h 91ff889115ecd01f436d3611f7f5
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
- F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
+ F src/os_win.c b169437dff859e308b3726594094a2f8ca922941
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 +F src/pager.c 525f3698f9a6b47a6e0f5496675529a183c2462b
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 +F src/pcache.c e9c00846d3dcdaa75b288c6f16238c2fe2177823
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
@@@ -384,10 -384,10 +384,10 @@@ F src/sqliteInt.h b3744b29555b83054f315
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
+ F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
  F src/test1.c 457c601302b8a0f5960dffd17b6a2877603841dd
  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
@@@ -1484,7 -1482,8 +1484,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 9682c0433c04713c28bd9105a7e20af7372f873e
- R ade8e2f9d92ad43fcc4c6c4e5d1634ec
- U dan
- Z 4a91ff9d1af5229ff41acb5284c79d70
 -P 83cfe82cd6d31ec0a6193525fd92e63a2a43b142 929fa4c31e7c5b8c6cbb1412478ea91b15ad5529
 -R 7c661a721c213e6ed7f2c57fe9448b49
 -T +closed 929fa4c31e7c5b8c6cbb1412478ea91b15ad5529
++P bbac71aa2aa2380d393cda3be64b0208b464b27e 68142dc541b7a0a36fcb075a26f10f03c1e7c422
++R 1994a5cf2620dcff255de451b3e7e2bc
+ U drh
 -Z 9101c9e33a00c3414d9af87354786d43
++Z 9d74e847564ac60e89481ff586af6447
diff --cc manifest.uuid
index 90747752ed,420021215e..461dc7f06f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bbac71aa2aa2380d393cda3be64b0208b464b27e
 -68142dc541b7a0a36fcb075a26f10f03c1e7c422
++e2edd34e79af906e7069e3e837730b12de0b73fe