From: drh <drh@noemail.net>
Date: Tue, 3 Jun 2014 20:09:48 +0000 (+0000)
Subject: Merge the 3.8.5 release candidate changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83f951ee95cf0b923400052891e55af9d79fa9b6;p=thirdparty%2Fsqlite.git

Merge the 3.8.5 release candidate changes into the sessions branch.

FossilOrigin-Name: 09e75d82d02f900e58eceaaa010a42fc7044c89f
---

83f951ee95cf0b923400052891e55af9d79fa9b6
diff --cc manifest
index cd46f94dfe,20001ad2d1..2822363061
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2014-05-29T20:29:13.254
 -C Avoid\sclosing\sa\spseudo-table\sassociated\swith\ssorting\sin\sa\sco-routine\ssince\nthat\spseudo-table\smight\sbe\sused\sagain\sin\san\souter\sloop.
 -D 2014-06-03T14:42:34.857
++C Merge\sthe\s3.8.5\srelease\scandidate\schanges\sinto\sthe\ssessions\sbranch.
++D 2014-06-03T20:09:48.914
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in faf03dca4bd103f3e98b317aeba930dea49cfaa1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
 +F Makefile.msc ac23895c1c2928518fa729b3b71bc30a6ab19347
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -234,17 -220,17 +234,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 7df17ec5506c2427576d412bee0e6ea740e12563
- F src/shell.c 33f6c0bc0e32eae099f7c2b79cfa7515b4b4702c
- F src/sqlite.h.in 78ac857a20a16d03b343320973b7da1736ff8fe9
+ F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
+ F src/shell.c 98ce7f52445aa0c2eac3d4553a4cdcbb6402a670
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
++F src/sqlite.h.in a585e10c0d181b0f102df93477cfd3ab2b98b2e5
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
 +F src/sqliteInt.h b9260ccf4c1ca2e26bc0789597c0a132aad4961b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
 +F src/tclsqlite.c 7ada527ce7916adcabad7997c10f09680aac7c9b
- F src/test1.c 899bddeb0c7fb2b8062de6f03af4a4e4f48f9df5
+ F src/test1.c 4edf8810c86d77ae7ac6d56d563965a9beeea2ce
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -760,7 -746,7 +760,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 f3617ac9b55f63c031c13f5fa9e57116fc597165
 -F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
++F test/permutations.test bf568516e21758f2961a4612f29dc422d3ab75c1
  F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1188,7 -1173,7 +1188,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 a769c7e03e6d4163986d49652687de34d15906a0 8f916ed1e185ac728e00624d90e1d7bd2dda4469
- R 3370b40cbcc7803475544bb7516ae78d
 -P c6b512a724aebcd084aad2a80d020b95773b3012
 -R 679d3413ba6dc377c3eacd5814f0f801
++P 9f18e78f039ffa89a8806810ad385bdc51bc88ed 6d81805298ea882f5fee99504d5a95f1a762a90b
++R 1b537fdde3fe5617547753819824a8f7
  U drh
- Z cb38c4d301930323a7c7581f1a945fe2
 -Z d6f5ccfdba8b994a53e0334e1b572467
++Z 60e68d7eb2611275d6e02a10bd056454
diff --cc manifest.uuid
index 1031ff599e,40af1ce51c..8f7efb767e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9f18e78f039ffa89a8806810ad385bdc51bc88ed
 -6d81805298ea882f5fee99504d5a95f1a762a90b
++09e75d82d02f900e58eceaaa010a42fc7044c89f