Merge all recent trunk enhancements and fixes into the sessions branch.

FossilOrigin-Name: e158812c34b01ce516d26636a489509bf61d1c27

diff --cc manifest
index d92c7d7b7ca7d12042dce6bb1c4feef740e398e1,41c2bd4ae037704f459550622cc4543da3130699..551c5d8bd65a59e2556191d06d67b475eb765e34
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sthe\ssqlite3_rtree_query_callback()\sAPI\sto\sthe\sRTree\svirtual\stable.
- D 2014-04-28T17:51:12.403
 -C Add\sthe\ssqlite3_rtree_query_callback()\sAPI\sto\sthe\sRTree\svirtual\stable.\n(Cherrypick\sfrom\sthe\ssessions\sbranch.)
 -D 2014-04-28T17:56:19.891
++C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\ssessions\sbranch.
++D 2014-04-28T18:02:21.241
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -196,7 -182,7 +196,7 @@@ F src/global.c 1d7bb7ea8254ae6a68ed9bfa
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c e1ebd5d798da6b8dc180841c34e3c91b4d1fb798
 -F src/insert.c ab34bea5af4fee9f956a0805a32463fb7f674d00
++F src/insert.c 2396a980907782f959362c2aef8e1596bb57c5ac
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@@ -232,12 -218,12 +232,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 269c3e31a450fce642a10569221a49180348c88e
+ F src/select.c bc7feff0fb4c4a1b9d655b717bef166846b48e33
  F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -F src/sqlite.h.in bde98816e1ba0c9ffef50afe7b32f4e5a8f54fe0
 +F src/sqlite.h.in 6e6d3e092ca968abb3e65fbe22ec9220a3b616b6
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 8697c8e82d4d2ccbfe7fd2f582081e600c9dc7fc
 -F src/sqliteInt.h 03e2f60ccb0745fa2d3a072cb4f75fa29251d2ee
++F src/sqliteInt.h 76b4d4f0b9200e58b0a2d5339e2d46b4c7c7c691
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -293,12 -279,12 +293,12 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 9d883d5c91c5e7636cd56e952a0ff567e2d5c119
 -F src/vdbe.c 699693bea6710ed436392c928b02cb4e91944137
 -F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c d6038559beb49c57f73a79412821d7143fc276ee
 +F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca
 +F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
 +F src/vdbeaux.c e0c2e24ee12c94b6d7cb1c521a0b26cd2e3231d9
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
  F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1177,8 -1165,8 +1180,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 95e77efe076ab421bd246119c47dba5dacf9d087 f7dad408dd46a1e3612b6142a3afb1d0d4fcda00
- R dc0ef589b047e789a0dc76337788157a
- T +closed f7dad408dd46a1e3612b6142a3afb1d0d4fcda00
 -P f5a263658187250044afc1a74000e6f6962733ca
 -Q +3dca2809352c6c6d56db74447a814f77011c6220
 -R 70a04a84bf76743284b12f147604df6e
++P 3dca2809352c6c6d56db74447a814f77011c6220 af2cbe64adab5f9e3b0f3da00d06428088589d7f
++R 9172deb3091895924031286a7ef97633
  U drh
- Z d1607abc9a994a369c35e1f132aa6989
 -Z 8441eee0dd2b010346629b18a46aad71
++Z dedb5680561bda872be1d3df9c89cc1d

diff --cc manifest.uuid
index ce5967cbb03eae6d3cadea330bc5b1f45bda38ed,fbb0a3e2f9cc7d2900e460f2d1b14b6213e0c494..0367d488c95c46cb6ad1d47fbe7c61ad8b1b6c72
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3dca2809352c6c6d56db74447a814f77011c6220
 -af2cbe64adab5f9e3b0f3da00d06428088589d7f
++e158812c34b01ce516d26636a489509bf61d1c27

diff --cc src/insert.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge