Merge recent trunk enhancements, and in particular the improvements to

the b-tree balancing logic, into the sessions branch.

FossilOrigin-Name: 28b044a51215a3f64dafb2cf3b6cb7d2029580ef

diff --cc manifest
index c85b4471f38c7f79dd16ce160f0691a336fb49c4,ce0614fbee700d9d41c216fa452eb80dce47c233..26da220ff3ac800e28f26ba6fe5365a2ea89d327
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sall\sversion\s3.8.7\supdates\sfrom\strunk.
- D 2014-10-17T11:53:22.349
 -C Change\sthe\scommand-line\sshell\sman-page\sto\suse\sthe\s".tr"\stroff\sdirective\ninstead\sof\s".cc"\sfor\sescaping\sthe\sinitial\s"."\scharacters\sin\sthe\s".help"\noutput.
 -D 2014-10-31T14:46:51.896
++C Merge\srecent\strunk\senhancements,\sand\sin\sparticular\sthe\simprovements\sto\nthe\sb-tree\sbalancing\slogic,\sinto\sthe\ssessions\sbranch.
++D 2014-10-31T14:53:32.379
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in dd5f245aa8c741bc65845747203c8ce2f3fb6c83
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 35808af7f8d999176ed5b38fb482a87a129ee3e1
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 53a0b870e7f16d3b06623c31d233a304c163a6af
+ F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -180,25 -163,25 +180,25 @@@ F mptest/mptest.c 499a74af4be293b7c1c7c
  F mptest/multiwrite01.test 499ad0310da8dff8e8f98d2e272fc2a8aa741b2e
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
- F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
+ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
- F src/analyze.c 8c322e1ecc08909526dbd5ab4421889d05f2263d
+ F src/analyze.c afbcca663c3f3625340b8e30d440cd7a97ded6bc
  F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
- F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
- F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
+ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
+ F src/backup.c 7f841396adfd47507ff670a471162d2bfcda3136
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 1b1123cba0c65caa0baa51e71b8c089e3167c3ed
+ F src/btree.c 61d96c2edacc5267fae6e477c24c774cd540d7f0
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
- F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
+ F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
- F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
+ F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
+ F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
- F src/delete.c de3d07d6602b90ae6e8bdebeb7b3265bb846377f
- F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
 -F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
++F src/delete.c 20a360262b62051afacb44122b3593a8bd9be131
+ F src/expr.c 0391a657df4959eaf2a2fd7d77de5ebe750686ee
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
  F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
@@@ -211,7 -194,7 +211,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c c67be3c356abdf33d00b2345e653c41b4049bee1
 -F src/main.c 2b882f64580ea72e2d972a5296f9eaa75a353161
++F src/main.c 7a3d124561f3fd0555dbefe492f5db0a4ba9f8d8
  F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@@ -239,22 -222,22 +239,22 @@@ F src/pcache.c 4121a0571c18581ee9f82f08
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
  F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
  F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
- F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196
- F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64
- F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
- F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
+ F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
+ F src/printf.c 10a2493593c8e4a538915cd3674bd7a67f70c488
+ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
+ F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 428165951748151e87a15295b7357221433e311b
- F src/shell.c f2b146c89967d83cca8735126ee9ff4ce7345dd1
- F src/sqlite.h.in 514eeb7b0845840c132736e714ddd98ab9216e6c
 -F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
 -F src/sqlite.h.in 737b7dd0f3f81fe183646d22828b39f85ef3e68c
++F src/shell.c e3a0e5d94d58fbaf9a4a0a4bb2db19ed2e64be6d
++F src/sqlite.h.in 322c7813901be3038a7df08cdb456ad76e880f60
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h f712b324bafdc646c7fcfe813f81e8b8eebb57b9
 -F src/sqliteInt.h 4f86ac648ea398c1bb3db036062934cde257ea23
++F src/sqliteInt.h 339f3f8bf633452d271a3c9c593c4a0faaa171f8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
- F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
+ F src/status.c 81712116e826b0089bb221b018929536b2b5406f
+ F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
 -F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
 +F src/tclsqlite.c 684c317b85f4729de12909bfad80d3f5500357cf
- F src/test1.c 518db4305d76b29dd9da3f022ca899c8fcdf9fc7
+ F src/test1.c 63d4b1707c4052cf9c05c1cbb4a62666d70a0b48
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -302,20 -285,20 +302,20 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 6de09362b657f19ba83e5fa521ee715787ce9fee
  F src/tokenize.c cc9016e5007fc5e76789079616d2f26741bcc689
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
- F src/update.c b9e5295d3a78e96b7c2978c4f9d224d06880f031
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
++F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
+ F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c a1465183697f2a187520d13cebf6a41f3832e0c0
 -F src/vdbe.c 49e659bc165e99b28492004b440e22146dc898ab
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h acc36ac461f973f46ac7942f86abdd93d2f8cfbc
 -F src/vdbeapi.c 02d8afcff710eb35e3d9e49cb677308296b00009
 -F src/vdbeaux.c 3d6b2b412ef2193aa4729922dfc5df1efadbf6df
 -F src/vdbeblob.c 8b5442ff0954c44b45cbabbe2e94091a2e16fdef
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
++F src/vdbe.c 407f16f5991c5bb27978e00bf74e64dd0dabd692
 +F src/vdbe.h d61daeffed696e21630759de9e135ee298ad9573
- F src/vdbeInt.h 7254c20b45033e1194601a02f3a386e39263c0ab
- F src/vdbeapi.c 30a1c991147fdf4334900b5fed8a312ae7678707
- F src/vdbeaux.c 191ea23e5adbe5b6adcb9d31860b9fb890834e24
- F src/vdbeblob.c d65b01f439df63911ac3d7a9a85c15503965f2c3
++F src/vdbeInt.h 18756149efd3a931803381074dccc4ce161c7063
++F src/vdbeapi.c 1a5c9248249f3e17bd0707da799d4c613970ffe1
++F src/vdbeaux.c d53c188cde088b58bd2733144c4c803e32bf2bba
++F src/vdbeblob.c d83b1f9e8f3c0359adc8404b8673b7994739daf7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
+ F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
  F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
@@@ -1215,14 -1202,15 +1220,15 @@@ F tool/speedtest8inst1.c 293327bc76823f
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
  F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 -F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
 +F tool/symbols.sh c5a617b8c61a0926747a56c65f5671ef8ac0e148
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
+ F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 236704a9d1551a50a55bd6e0b6473191a7a7dd21 e4ab094f8afce0817f4074e823fabe59fc29ebb4
- R 94ea0ef4c36ef357c67b389bf2d7aa16
 -P a07078b60007e88adea67bec5f0caf91f707ad78
 -R f904ce78baced6aeb6bcb91c631714db
++P f4de9e07be3819db222317725e62ea997cd22a20 67f0d469da28c023200239a1f3d0c6cef9ef0e45
++R c6574894282e9c56b60788bbd17b6d37
  U drh
- Z bebb5b662648007cddd6eaea9299c843
 -Z c463256d5d45e3bce4a212ca4dd9f3e4
++Z d46687ae123d3be720b18e6a3cbacd2c

diff --cc manifest.uuid
index 54e0e227d77806f6655e6f88547dfc4f10d0fdd3,4735237141e4b3b2c7251db22332af7dedadb938..374c4eafaec004f42876fedb2ee7d373788d613c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f4de9e07be3819db222317725e62ea997cd22a20
 -67f0d469da28c023200239a1f3d0c6cef9ef0e45
++28b044a51215a3f64dafb2cf3b6cb7d2029580ef

diff --cc src/delete.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge