Merge trunk optimizations.

FossilOrigin-Name: 71e7299e8d501618b10f8c1f78572789b1b6853a

diff --cc manifest
index c837c84960d567afe40014ff4b5c14658c2feb71,5e842820c79e3baef9a3c83f163f3c2be10e893d..0ab2bd2e03fe34b9c8ddb66fce4133de053dea2e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements.
- D 2015-09-01T18:01:16.369
 -C Add\sthe\ssqlite3VdbeLoadString()\sand\ssqlite3VdbeMultiLoad()\sroutines\sto\shelp\nwith\scode\sgeneration,\sespecially\son\sPRAGMAs.\s\sRename\ssqlite3VdbeAddGoto()\nto\sjust\ssqlite3VdbeGoto().
 -D 2015-09-03T13:46:12.406
++C Merge\strunk\soptimizations.
++D 2015-09-03T14:04:05.544
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,10 -279,10 +279,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c ca6c7e4bbbf91b6c91d0278942b917e81d3fc18d
 -F src/btree.c 4084d9eed2817331f6e6a82230ba30e448cad497
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 6c3a8a9b21402a6be98126f7d86b76527e68ca67
++F src/btree.c 89f97b912a959d82c1ab399da3057c93505cfa8f
 +F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 +F src/btreeInt.h 171864bcd81635583dab7b8a04b19b454b18ef80
- F src/build.c cbf7c81a63b5afd12d289ce5c6c2f62f893379a3
++F src/build.c 565d84cf1d80e054e15907641985584bbd5eadf6
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -321,19 -321,19 +321,19 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 388c023582b17890f10c980b30ec1922b471753b
+ F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55
  F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c aa916ca28606ccf4b6877dfc2b643ccbca86589f
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 +F src/pager.c 284edd20ae51f1f52a539685ce42c7a1e61ac716
 +F src/pager.h 174fd2cd7091c87418616c62582a5c00cb8da2ac
 +F src/parse.y 1e645cacb93979c59f2a510ee2c100e769bd5e3c
  F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c a3fe31b17e841ec70beee72a2c960e9c787a8857
- F src/pragma.c a239d2c8c6d87d589927547f234b0f6259c69f62
+ F src/pcache1.c b31af9dbc83b9c68e87d681b8453a9605f28e734
+ F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
- F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
+ F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@@@ -396,27 -396,27 +396,27 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
+ F src/update.c 795fba8ebadeb194285b0a73a07f7ad5ae4d0410
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
+ F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
 +F src/vdbe.c 791a28761cf6176d11ec3e41cdf8e749c65384ff
- F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
+ F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
  F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
- F src/vdbeaux.c 9c59b0604489ebe62869a59f3b627c822d32b278
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
++F src/vdbeaux.c 33e2973796a016956887466c2b3a1991eab3af6c
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
+ F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 00352cb9d23c5599f219496d4b22f30d4e30f8ac
 +F src/wal.h ec78c303882bc04b3d0b86f0ddbc87309401595a
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
+ F src/where.c f0e08e4f1f66ba1a0f5b70c5161cb031ce1fb858
  F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
- F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
+ F src/wherecode.c c0d9b1c7c7c827998016809851d2ddc529de0fee
  F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1383,7 -1380,7 +1383,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5ed2a445a164f0f0c2669c6681ea76618e639961 1da60c3dda4254620052a83c853c2d2b6dd5009f
- R 4fa469416c52b53416b7d4829f16cd6a
 -P d7f4bdf594e93c848f46901637861c8eed4c34df
 -R 87d27a58ce6d4a6cd03f169f2370f2fe
++P 3dea047465fa8e3031046a33016b6ed760336ddc 847387ec8e6fef283899578fb232b2c23b00ee5b
++R 7c90873b273aeaf2eed231afaea97e29
  U drh
- Z 948301ca23388fa4e198d2911e3605bb
 -Z bdbaccc5e83ea81c60c1b2c883af5b3e
++Z 99e28d5734be346b4e9234313f30bb5e

diff --cc manifest.uuid
index 953e5bbd33f88df7c36e16d05fcaed9796f5b934,3428834616b9d6af58a4775744166c3ed538397d..3c32784a2375629dd4bf22b711b0e3040d99f9c1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3dea047465fa8e3031046a33016b6ed760336ddc
 -847387ec8e6fef283899578fb232b2c23b00ee5b
++71e7299e8d501618b10f8c1f78572789b1b6853a

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge