Merge the recent performance enhancements implemented on trunk into the

threads branch.

FossilOrigin-Name: dfdc900f5d1a31ee5c5f35a630c4a8253e69093b

diff --cc manifest
index d04b6be24beefb26e08ecd20a3c78b3268944c2a,3c6bec475e322f224637afa9099f431ad540fffc..d18353dedb07852ccd0d5304d6010d11bdbb4a7d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\s3.8.6\srelease\sinto\sthe\sthreads\sbranch.
- D 2014-08-15T15:46:21.010
 -C Remove\sthe\spager_lookup()\sfunction\ssince\sit\sis\sredundant\swith\s\nsqlite3PagerLookup().
 -D 2014-08-25T11:33:41.726
++C Merge\sthe\srecent\sperformance\senhancements\simplemented\son\strunk\sinto\sthe\nthreads\sbranch.
++D 2014-08-25T13:27:02.036
  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
+ F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -164,33 -165,33 +165,33 @@@ F src/alter.c b00900877f766f116f9e16116
  F src/analyze.c f98a351908da29f7b44741cfeb9eb20dda648ba0
  F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
+ F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
- F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 691d09b5d243b0d42c071d2ad0e2476aebdeea92
- F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
+ F src/btmutex.c ec9d3f1295dafeb278c3830211cc5584132468f4
 -F src/btree.c 4737cb5bdb2eb8989cb292f6ff921f7ff45f0c46
++F src/btree.c a10ceaccf04fbc1670907e1d79013e1a7a89edee
+ F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 6aa8134d18fe1746b5d2885a361ee093e5145ae2
- F src/callback.c fcff28cf0df2403dd2f313bb8d1b8f31f6f3cd64
 -F src/build.c 058e3aadb1376521ff291735237edf4c10f438fb
++F src/build.c c26b233dcdb1e2c8f468d49236c266f9f3de96d8
+ F src/callback.c b97d0695ffcf6a8710ee445ffe56ee387d4d8a6f
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
- F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
+ F src/delete.c 5adcd322c6b08fc25d215d780ca62cebce66304d
  F src/expr.c f749009cf4a8534efb5e0d5cd7c9fb1fb0f2836c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 8545f3b36da47473e10800ea4fb0810fd4062514
+ F src/fkey.c 8d81a780ad78d16ec9082585758a8f1d6bf02ca3
  F src/func.c bbb724b74ed96ca42675a7274646a71dd52bcda7
 -F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
 +F src/global.c 77ec119d6f6453039c2820336af8e8f804f20acf
- F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
- F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
+ F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
+ F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 991e4964e9295da3993e2c0f81c7faf642371848
+ F src/insert.c d1a104e67b33314d4cc5c1356147446086ab9fc8
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
- F src/legacy.c febc2a9e7ad6c1a6191c7b5b9170b325d263f343
+ F src/legacy.c 87c92f4a08e2f70220e3b22a9c3b2482d36a134a
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
- F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 333a7134a4e08f7660c4e52390eda99c49493ba6
- F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
+ F src/loadext.c 31c2122b7dd05a179049bbf163fd4839f181cbab
 -F src/main.c 900dd06e41d22795cbb23ab0240397f1e2901bf7
++F src/main.c ce41520e565eb8ef09824fa9778a72364291d371
+ F src/malloc.c 954de5f998c23237e04474a3f2159bf483bba65a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
  F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
@@@ -208,31 -209,31 +209,31 @@@ F src/os.h 60d419395e32a8029fa380a80a3d
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
  F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
- F src/os_win.c 058cefbeb0f9713b7cc161c6d09e5a1770d26e11
- F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
- F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 -F src/os_win.c d067fce558a5032e6e6afe62899e5397bf63cf3e
++F src/os_win.c 08ce5616a5755da9400931fb39146e4a97801a2a
+ F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
+ F src/pager.c 53cc5e9d73afb74add79f49755c8ee240fbdbef7
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
- F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
+ F src/pcache.c da602c5447051705cab41604bf3276815eb569d0
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
- F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
+ F src/pcache1.c c5af6403a55178c9d1c09e4f77b0f9c88822762c
  F src/pragma.c d10ef67c4de79f78188b965b4b7988aff1d66f2e
- F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
- F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
+ F src/prepare.c 3842c1dfc0b053458e3adcf9f6efc48e03e3fe3d
+ F src/printf.c 00986c86ddfffefc2fd3c73667ff51b3b9709c74
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 0ea356d32a5e884add23d1b9b4e8736681dd5697
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea
 -F src/shell.c 728d2226594d356bf4fbdbdfd08538fd78fd06f3
 -F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553
 +F src/select.c f8b0b6c43bee15f4e239ead1c9c9e3009e507e39
- F src/shell.c 26f8ef7f52b26644bb9098c62cee8694c17b3259
++F src/shell.c 200772eebd7b0fcf2072fc3dbd95d694389d5efa
 +F src/sqlite.h.in fef15a64d1358f5c365bd3f46f4c1915d5a5e5f0
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h b500ee46173fb510f8e10891a58bbf8e657bb3e6
 -F src/sqliteInt.h d8a9be2aa123a78c90ad4aba09b23e7dd3f8cc9f
++F src/sqliteInt.h 80d0bb053ef728896142c4e808bfcdc49494e9be
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
+ F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
 -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
@@@ -252,11 -253,11 +253,11 @@@ F src/test_fs.c ced436e3d4b8e4681328409
  F src/test_func.c d3013ce36f19ac72a99c73864930fd1fa41832f8
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
- F src/test_intarray.c 87847c71c3c36889c0bcc9c4baf9d31881665d61
- F src/test_intarray.h 2ece66438cfd177b78d1bfda7a4180cd3a10844d
+ F src/test_intarray.c db4614c2262a06abc4409dc048d59c580c38320f
+ F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
  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 ca90057438b63bf0840ebb84d0ef050624519a76
  F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
  F src/test_mutex.c 293042d623ebba969160f471a82aa1551626454f
@@@ -277,23 -278,22 +278,23 @@@ 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/trigger.c 4bddd12803275aa98f1c7ce0118fceb02b2167f6
  F src/update.c ea336ce7b8b3fc5e316ba8f082e6445babf81059
- F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
- F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
+ F src/utf.c 77abb5e6d27f3d236e50f7c8fff1d00e15262359
+ F src/util.c 068dcd26354a3898ccc64ad5c4bdb95a7a15d33a
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c aae4addde348f8a8d94a907f41c4524b7e2e0529
 -F src/vdbe.c 0fe4b47668b36a50bd9f7fd7b15cbeeb69d54b37
++F src/vdbe.c 93cf510b8e59df5fffcc4a9de9bef9c046979ab1
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h 8870adf012235708f125f8cd1c988f487dc3eb6f
- F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
- F src/vdbeaux.c 142fdb31f6423fb3c66a7b0687dbf894a259b1cf
- F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
- F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 -F src/vdbeInt.h 20056cd59ff93ef9eb91009ece726d65dd7ed322
++F src/vdbeInt.h 94f5cb24803285c8b29026f55b5e05ac69232ce5
+ F src/vdbeapi.c cda974083d7597f807640d344ffcf76d872201ce
 -F src/vdbeaux.c dba006f67c9fd1b1d07ee7fb0fb38aa1905161d1
++F src/vdbeaux.c cef5d34a64ae3a65b56d96d3fd663246ec8e1c36
+ F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
+ F src/vdbemem.c 4c9d686da474957d2e78834f13cc5f141fe6b87f
 -F src/vdbesort.c f7f5563bf7d4695ca8f3203f3bf9de96d04ed0b3
 +F src/vdbesort.c b9a830685826c057cfd41993902a5afc6fe436e1
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
- F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
+ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
@@@ -849,8 -846,8 +851,8 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 -F test/speedtest1.c d29c8048beb7ea9254191f3fde9414709166a920
 +F test/speedtest1.c f452891e50571627f7060c0e1262359127055717
- F test/spellfix.test 61309f5efbec53603b3f86457d34a504f80abafe
+ F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
  F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
  F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
  F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
@@@ -1191,7 -1188,7 +1193,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 a608fd1d52606a009c3acc7f1d184b86a7df3c82 9491ba7d738528f168657adb43a198238abde19e
- R 2da06d5c8da6ea94aeb00428a88d4808
 -P 3ca5846da7da5e08192a4c96288197be3b7ab6f7
 -R e183e353a27fb2d0c63a06eeb0b66e97
++P 05807c4122505567ec64fb2d142077f48a0a10b1 54164ce47cfc3ad5dd8797114e4ba78811f23bef
++R c157557aea90a1674d041ac0f1de2f68
  U drh
- Z 1c5f8fe63924bc5d5031f6b27d8e1190
 -Z 12acde8fd951a315f106f1112e06c5c6
++Z 10ad80e0aa78a5fbf32d4d843030da4f

diff --cc manifest.uuid
index 41ae00ee76cfb78618e86fbbddfab3fa72a1820d,698dca573d674c72aad6dc2139c698b883158141..8fecff4bd8bf3d2be208fc0e1bd3d1c87110ec14
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 05807c4122505567ec64fb2d142077f48a0a10b1
 -54164ce47cfc3ad5dd8797114e4ba78811f23bef
++dfdc900f5d1a31ee5c5f35a630c4a8253e69093b

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge