From: drh <drh@noemail.net>
Date: Thu, 5 Jun 2014 13:22:52 +0000 (+0000)
Subject: Bring the threads branch up-to-date with the 3.8.5 release.
X-Git-Tag: version-3.8.7~132^2~33
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=33ca481923bb6b0b68dfcdbba0ed15aca7c5037e;p=thirdparty%2Fsqlite.git

Bring the threads branch up-to-date with the 3.8.5 release.

FossilOrigin-Name: e4b01676d7e7ac14f5120ca3a618cc34dbf5dab2
---

33ca481923bb6b0b68dfcdbba0ed15aca7c5037e
diff --cc manifest
index a2e0dec014,fa19abb656..3a2589ab46
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\schanges\sfrom\sthe\strunk\sinto\sthe\sthreads\sbranch.
- D 2014-05-29T20:24:20.500
 -C Fix\sa\sproblem\sthat\swas\scausing\sthe\sFTS4\sintegrity-check\scommand\sto\sfail\sif\sthe\stable\shad\sone\sor\smore\s"notindexed"\scolumns.
 -D 2014-06-05T11:15:56.350
++C Bring\sthe\sthreads\sbranch\sup-to-date\swith\sthe\s3.8.5\srelease.
++D 2014-06-05T13:22:52.195
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in de92112472618cb869d27249966bad1783e4a853
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
 +F Makefile.msc f64754550a1272b7f840e8594a8b40c0b46792b4
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -206,7 -206,7 +206,7 @@@ F src/os.h 60d419395e32a8029fa380a80a3d
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
- F src/os_win.c cf4f35cd6cac5ab8327ffd32e6495326d88ec65e
 -F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
++F src/os_win.c 5f8c5568cc749d6ab44006124e7701f463559223
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
  F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@@ -220,17 -220,17 +220,17 @@@ F src/printf.c af06f66927919730f03479fe
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 -F src/shell.c 98ce7f52445aa0c2eac3d4553a4cdcbb6402a670
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
- F src/shell.c 3d2cdb8d6a5ec11212d727d07ff41c9706084de7
- F src/sqlite.h.in 53858ef439c84d794719901226447e8b5defb1b2
++F src/shell.c c431e19b27f89740ed37d73b11fe7d273dc3d411
++F src/sqlite.h.in faf9dadad407b0d5dd9e5bea26c021e1e31813b1
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
 +F src/sqliteInt.h 00cd3cf7be9ea28b963773de165eeb800c94d17c
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c 268f7f2216eb8c0c2d9e65e6388ae7e499854aba
 -F src/test1.c 4edf8810c86d77ae7ac6d56d563965a9beeea2ce
++F src/test1.c 79a39c0f32872fce62779b8a3030b7b41ad50a06
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -747,7 -746,7 +747,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 5da30f29e9bc59cf21c891ed1360b14d5d777c68
 -F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
++F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
  F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1178,7 -1173,7 +1178,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 8215202759dbd863edf20aa26ff21da20bc35d73 8f916ed1e185ac728e00624d90e1d7bd2dda4469
- R 93affc38efdff0f238968fb6f1ed7e17
 -P b1ed4f2a34ba66c29b130f8d13e9092758019212
 -R 377d24b74ba4106b5f52a423e2a5cf2f
 -U dan
 -Z 2cd68ab7b6aef503eef49b559771fe52
++P 416cb091267de91b9cadee9f7453b8627570b7d3 7123bb2605216396f65db5d156431b3613f313b5
++R d113ee04571f0b7cf0adf33015212cb5
 +U drh
- Z f0e22f612bd7c7522e7f5c332e9f43cb
++Z f5daccd6a06b1139036d97ee038b8b45
diff --cc manifest.uuid
index a6ec05a37d,67f786fd6a..315b55c6e2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 416cb091267de91b9cadee9f7453b8627570b7d3
 -7123bb2605216396f65db5d156431b3613f313b5
++e4b01676d7e7ac14f5120ca3a618cc34dbf5dab2