Merge all recent changes from trunk.

FossilOrigin-Name: a353a8515fb2eff86042d0c33e39772f4d04e0b3

diff --cc manifest
index e5ae89aca50a04dcee9fbd9a0231ce2e5e368a48,a945d8dafc22e55deb90177a8a81ca9cf8597122..31ec92e82f2327e4dfa71c989ef9f68215f5ac88
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sa\snew\ssqlite3FaultSim()\scall\sto\svdbePmaReaderSeek()\sto\sfacilitate\ntests\sof\serror\shandling\sin\sthe\ssorter.
- D 2014-07-30T18:47:12.395
 -C Fix\stypos\sin\sthe\sopcode\sdocumentation.\s\sComment\schanges\sonly.\s\sNo\schanges\nto\scode.
 -D 2014-08-06T01:08:07.269
++C Merge\sall\srecent\schanges\sfrom\strunk.
++D 2014-08-06T02:03:35.291
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -167,20 -167,20 +167,20 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c dff8e7789730e835b66d81f9eb68de2352845012
 -F src/btree.c 99d162e57af6e72ffd7db5bf79568a134cd87d5b
++F src/btree.c f3d64fe70d61b2c970b3633506ad5e7fc684c6a1
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c f6e49e1b32fe1aed6971da5712131d9272d7d81c
- F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
 -F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
++F src/build.c 6aa8134d18fe1746b5d2885a361ee093e5145ae2
+ F src/callback.c fcff28cf0df2403dd2f313bb8d1b8f31f6f3cd64
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
- F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
+ F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
+ F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
  F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
 -F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
 +F src/global.c 77ec119d6f6453039c2820336af8e8f804f20acf
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -208,7 -208,7 +208,7 @@@ F src/os.h 60d419395e32a8029fa380a80a3d
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
- F src/os_win.c c4d89c7e38a2ac1c6c90bf084131a44ed682790b
 -F src/os_win.c e5f0fc446a682b70db3397d14cca9806d9a15d12
++F src/os_win.c 9a7fda788394109131677a9fceee8d54820b6c16
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
  F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@@ -222,17 -222,17 +222,17 @@@ F src/printf.c af06f66927919730f03479fe
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
 -F src/select.c 1529c49075464c5a95fde77314073612b1b8d595
 -F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in 9bbc5815c73b0e77e68b5275481a5e3e7814a804
++F src/select.c c28f5165280ea7214285e4c53a23b257e1a06127
 +F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92
 +F src/sqlite.h.in 44b761ddf5362581617d08457f11ee582eb103a2
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 9c1e5b965191c54157b155e321fa473b9734e062
 -F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
++F src/sqliteInt.h b500ee46173fb510f8e10891a58bbf8e657bb3e6
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
- F src/test1.c 74a6b2cc032e88543bf22c60f71173603761de66
 -F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
++F src/test1.c 363a5089230a92cf0aaa7a2945da7f2bf3b0a8d3
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -256,9 -256,9 +256,9 @@@ F src/test_intarray.c 87847c71c3c36889c
  F src/test_intarray.h 2ece66438cfd177b78d1bfda7a4180cd3a10844d
  F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
  F src/test_loadext.c a5251f956ab6af21e138dc1f9c0399394a510cb4
 -F src/test_malloc.c 1ff5b1243d96124c9a180f3b89424820a1f337f3
 +F src/test_malloc.c 27047a841f5bff1cb638123806a2c30714771307
- F src/test_multiplex.c 9f304bf04170c91c0318238d512df2da039eb1c8
- F src/test_multiplex.h 110a8c4d356e0aa464ca8730375608a9a0b61ae1
+ F src/test_multiplex.c ca90057438b63bf0840ebb84d0ef050624519a76
+ F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
  F src/test_mutex.c 293042d623ebba969160f471a82aa1551626454f
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
  F src/test_osinst.c 3d0340bc31a9f3d8a3547e0272373e80f78dde25
@@@ -277,21 -277,20 +277,21 @@@ F src/test_thread.c 1e133a40b50e9c035b0
  F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 +F src/threads.c 22dded4283dc4b25422f6444cdcb8d6b1ea0b5ff
  F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
- F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
+ F src/update.c ea336ce7b8b3fc5e316ba8f082e6445babf81059
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c e27749e6a5f65b3ff3388eab1472c0eaf6823b43
 -F src/vdbe.c 2db817cf7c51fa775ecc68160352aefc3d9870f7
++F src/vdbe.c 787d1b5178abaf44600702f6976a927d79ce3a92
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 +F src/vdbeInt.h 8870adf012235708f125f8cd1c988f487dc3eb6f
  F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 +F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 -F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
 +F src/vdbesort.c b9a830685826c057cfd41993902a5afc6fe436e1
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -754,8 -753,8 +754,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test bc474bafb022cc5014ef3a9c3d5ab61d6d6f587c
 +F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
- F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
+ F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
@@@ -868,7 -863,7 +868,7 @@@ F test/tclsqlite.test 37a61c2da7e3bfe3b
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl bc0889a2f86d9c17307992ca1e70391794780265
 -F test/tester.tcl b4ff83a8b069633f4aca788236d10a7086112a49
++F test/tester.tcl ed77454e6c7b40eb501db7e79d1c6fbfd3eebbff
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1190,7 -1185,7 +1190,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 721cd965859c9ccc24d2a1d2851c914229e584b3
- R 1fd8d4a346a6db9102e067303c7fe957
 -P 0ad1ed8ef0b5fb5d8db44479373b2b93d8fcfd66
 -R 1045cc0c95f68e0f0e2e47642b0ec158
++P 655d8cfc752b3f5f63521a57f2155f8e14aaf7c4 717245d48714c08156c9b7636aaa6c3a402bad66
++R 522f9cbdadcee03fc45f476dbd20c9a7
  U drh
- Z a72347f7edf8a1215db60e10b80e325d
 -Z fecab6dfa8d111d2725130892a38124f
++Z 56e08fa149f3ad8b1a6753df47adb03f

diff --cc manifest.uuid
index a8cbf441d2abd9eae1687a3899a5169b386ae880,c81900087c1a3ac1bf0a884c918a1ee8b305ee47..a7eb49c40ef46e2e62da1a0094b5ceb07894fd18
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 655d8cfc752b3f5f63521a57f2155f8e14aaf7c4
 -717245d48714c08156c9b7636aaa6c3a402bad66
++a353a8515fb2eff86042d0c33e39772f4d04e0b3

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/tester.tcl
Simple merge