From: drh <drh@noemail.net>
Date: Wed, 23 Apr 2014 12:57:55 +0000 (+0000)
Subject: Merge all recent trunk changes into the threads branch.
X-Git-Tag: version-3.8.7~132^2~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e0ed8d4ecf02a978f6ec0e8011a3adc5004d0e4;p=thirdparty%2Fsqlite.git

Merge all recent trunk changes into the threads branch.

FossilOrigin-Name: e2c9f71a451e44040624b9f255b4510743513019
---

9e0ed8d4ecf02a978f6ec0e8011a3adc5004d0e4
diff --cc manifest
index 644d369a1a,7f4e9189fd..2caa7ed483
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sto\sspeedtest1.c\sthe\s--threads\soption\sfor\ssetting\sthe\nSQLITE_CONFIG_WORKER_THREADS\sconfiguration.
- D 2014-04-18T13:57:39.195
 -C Comment\stweaks\son\sthe\stest\scase\sfor\sthe\s[b75a9ca6b0]\sbug\sfix.
 -D 2014-04-21T13:36:54.639
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-04-23T12:57:55.344
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc 153eb9b9725bc7b8e4dbe963219298e0c4a644b0
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -217,12 -217,12 +217,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 20055cf917222e660c4222fea306bd13a0623caa
 -F src/select.c bc7feff0fb4c4a1b9d655b717bef166846b48e33
 -F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
++F src/select.c 1a229278810ac02b9cb58687c3aa8cdc304d4dcf
 +F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
 +F src/sqlite.h.in 579aebacdea59386d9cdf01fd4a16f4cafbb248f
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 788c9b7d3b17120b3d67b1af9e12c10e4f95a324
 -F src/sqliteInt.h 03e2f60ccb0745fa2d3a072cb4f75fa29251d2ee
++F src/sqliteInt.h cc6486a5cc3071948e880297b0de07c07e6612c8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1164,7 -1161,7 +1165,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P f8f72ecb9052a4cace1db75879fb8b5131ea4f50
- R ec8b910c95550d011d611a610b4db207
 -P de9a490f594183f337a2ec9e0f87792eac83548b
 -R ce888b84132e0cad3bcca115a32951d3
++P 5fce40c44aacf883df2e8e9472c399a6e92197b3 65d2544af9adc1e2f1d193e57f8be0422fb0d5eb
++R 07151f40a802d55a98a20acba34885fa
  U drh
- Z 39c3a2898ecaace6ee1641d24df0dd67
 -Z cf9f241149456ab1fa24984e95a412d2
++Z 85be1e117efe898356ded29b053b1ff8
diff --cc manifest.uuid
index f698cc6543,a2761a597b..3cda1ddaf8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5fce40c44aacf883df2e8e9472c399a6e92197b3
 -65d2544af9adc1e2f1d193e57f8be0422fb0d5eb
++e2c9f71a451e44040624b9f255b4510743513019