Merge recent trunk changes into the threads branch.

FossilOrigin-Name: 8215202759dbd863edf20aa26ff21da20bc35d73

diff --cc manifest
index 86d0d6e9cdc6e430eab382d97892234a5f148d58,f1b13895232a2465b2ca93ad7e33b9e53d9cbb9d..fa9f74befe93ea3415e4e31b7d09addc70460099
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Improvements\sto\sthe\stestability\sof\sthe\sthreads.c\smodule.
- D 2014-05-20T19:11:50.626
 -C Fix\sa\sproblem\sin\sthe\sshell\swhen\simporting\sCSV\sfiles.\sIf\sthe\sleftmost\sfield\sof\sthe\sfirst\srow\sin\sthe\sCSV\sfile\swas\sboth\szero\sbytes\sin\ssize\sand\sunquoted,\sno\sdata\swas\simported.
 -D 2014-05-26T18:27:12.472
++C Merge\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-05-26T20:15:21.073
  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
@@@ -165,10 -165,10 +165,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c e14daeed62b5b1499835a6523f9a47d660c297c8
- F src/btree.h d79306df4ed9181b48916737fe8871a4392c4594
 -F src/btree.c e29fc07a968f8d1bbe38b5736d71db59959f545c
++F src/btree.c 34172d28ad9866c70ec6d64a0b39abf0fa923bdc
+ F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 9c522b6e5af1485c38b12a55f9d946e66fca61b6
 -F src/build.c 92539f47043ac9c48921450a9b2162da672bda4a
++F src/build.c c68e0391dbd1f16a29767a176fa71729765bfd24
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -187,7 -187,7 +187,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 14f02e450d8e5f78af7e75905632dd785cf93363
 -F src/main.c 40d0837e5d0597eadc47c3acc2fc95bdbd9250b8
++F src/main.c 67b07f2b22da21b28d9162511b1aba7244ef1e57
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -220,12 -220,12 +220,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 a5ed3fdc82ebab5b9b095ea1971515a7f8a303d2
- F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
 -F src/select.c a6e8fe35d2929911448fe29fc9194eec73c6c0a5
 -F src/shell.c bfac06fb15f3cd0d447e2e72ab3a283fac301813
 -F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
++F src/select.c b6a17082e897dfa18974e7538f68f61ffba3ff0f
++F src/shell.c 4b976f0461be5b9bdf0e406c04ac5f233044e792
 +F src/sqlite.h.in 53858ef439c84d794719901226447e8b5defb1b2
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h 1977f44283be0d3b40da315fb4fd9e21c79fadcc
 +F src/sqliteInt.h 7bda339d2422f20ec23c8a77d9ae7dfbe9ccc0b3
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -282,14 -281,14 +282,14 @@@ F src/update.c 5b3e74a03b3811e586b4f2b4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 4d11273a6a6644d948c534a17bdeaf42a2793d30
 -F src/vdbe.c 3ebcbe6a83198045b0411956fc6005b9f4a6991c
++F src/vdbe.c d4f57833c3cdc202d97fd924408b316b45cb4e1e
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 +F src/vdbeInt.h c78ace64dc37495806dd50596eded1f6cd2b5a64
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 +F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 -F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
 +F src/vdbesort.c a8b8798f23baa4b293804597532a94470e44f248
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -823,15 -822,11 +823,15 @@@ F test/shortread1.test bb591ef20f0fd9ed
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
  F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
- F test/skipscan1.test bed8cbe9d554c8c27afb6c88500f704c86a9196f
- F test/skipscan2.test d77f79cdbba25f0f6f35298136cff21a7d7a553a
+ F test/skipscan1.test 28c7faa41a0d7265040ecb0a0abd90c0904270b2
+ F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
  F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
  F test/softheap1.test 40562fe6cac6d9827b7b42b86d45aedf12c15e24
 -F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 +F test/sort.test 688468cef8c9a66fcc1d54235de8e4deac745690
 +F test/sort2.test c5e25eb674689e291d06b5209fe8d337ae0ec010
 +F test/sort3.test 6178ade30810ac9166fcdf14b7065e49c0f534e2
 +F test/sort4.test 971452fd4e2928e6fc05c3868396ad7d5f9ce2ad
 +F test/sortfault.test 1a12b6e27d475f50658a8164aaa34f0080a86b36
  F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
  F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
  F test/speed1p.test b180e98609c7677382cf618c0ec9b69f789033a8
@@@ -1177,7 -1172,7 +1177,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 99efb235a08784020535a770d7e7d96d9ccee12d
- R 41b3a138387644de9249d3787f3c7d11
 -P d90c4964fcf46b0b043dbfd58267098582267001
 -R 4f49cf43bba70559a864b8b79fde7303
 -U dan
 -Z b7657af7a09e4e39091c8340eac623cc
++P 386e088868b44b02646e452147838d2e97b093ee 856d44a206d82e96265103556dedda39ca3602b1
++R 4f55a610bf3d15f7ef06a03a46e29034
 +U drh
- Z 514d5c30144e64644ef12bde520c79ea
++Z 312c26c727a59647516cffebae558cf0

diff --cc manifest.uuid
index bffaf5bd3be78968ebaa184abfbbc89a8190a4d1,daf356e5f42e00d7ff355f75dd9e92082794e254..8540623713a442acb966a0503a5791284356e681
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 386e088868b44b02646e452147838d2e97b093ee
 -856d44a206d82e96265103556dedda39ca3602b1
++8215202759dbd863edf20aa26ff21da20bc35d73

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/vdbe.c
Simple merge