From: drh <drh@noemail.net>
Date: Mon, 18 Apr 2016 13:36:17 +0000 (+0000)
Subject: Merge recent trunk changes.
X-Git-Tag: version-3.13.0~53^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c03652b4514f93655f98b42a66ff09150c989a8;p=thirdparty%2Fsqlite.git

Merge recent trunk changes.

FossilOrigin-Name: d9768de502e34da42f3ad955947c23da50f57bce
---

2c03652b4514f93655f98b42a66ff09150c989a8
diff --cc manifest
index 4b67df4189,658ad56d1a..a150702877
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C sqlite3PCachePerecentDirty()\sshould\sreturn\s0\sif\sthe\spcache\sis\sempty.
- D 2016-04-18T13:30:50.144
 -C The\slast\sparameter\sto\spread64()\sand\spwrite64()\sshould\sbe\soff64_t,\snot\soff_t.
 -D 2016-04-18T13:09:55.691
++C Merge\srecent\strunk\schanges.
++D 2016-04-18T13:36:17.439
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -355,18 -355,18 +355,18 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c ca10edb445ad2c5fdc7285b49d72bcdf261fa23e
- F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
+ F src/os.c 4d83917f072ad958fba9235136fa2ed43df47905
+ F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
+ F src/os_unix.c d0b41a47eb5f0dc00e423a1723aadeab0e78c85f
  F src/os_win.c b169437dff859e308b3726594094a2f8ca922941
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 +F src/pager.c 4d849ad718980d698157cd136a40dc91cbeff4d3
- F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
+ F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 -F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 +F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
 +F src/pcache.h 60bc9893bfc0e16f8178fb5d8b6fcb8fab1d93c0
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
@@@ -1484,7 -1482,7 +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 ae16310c4e9a9b7e94874bd912fc6a4324cfaa2b
- R 0620b8f840563243b73e6076ebdcd81f
 -P 3e217d6265ecd16db783bed7ce1d9d0f9c4828bb
 -R 436b9ab5479b24882bf9b5114230dd45
++P 85f3d80eb7319754792eef76996b2c740a2b0073 3a7d72986fabe9434ff5bd02c93169314f072b23
++R 10404030b7871fd2cdace5bd8bb71227
  U drh
- Z 04d9a6e624a4591b3aa3f8ec5734f1ff
 -Z ed45643e1c73eeadd299c981e6f9488a
++Z 6da7b721a063bb7a65bebbe0704c9e5d
diff --cc manifest.uuid
index 9ac43a726e,9d96c70fe9..5a0c9f6cf3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85f3d80eb7319754792eef76996b2c740a2b0073
 -3a7d72986fabe9434ff5bd02c93169314f072b23
++d9768de502e34da42f3ad955947c23da50f57bce