Merge in last-minute patches for the 3.10.0 beta.

FossilOrigin-Name: c785cd7813e4ef6d6f2cb362a0f822713db6bcea

diff --cc manifest
index af4e2e21c856c5a804c861ee806256fcc30bb621,16288528007bb08bb7cb48904662a96a7b1aaac1..9ffb7e1a70fd8648bd73a1a5d0aa8f06f61dd1f4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2016-01-01T13:25:06.194
 -C Fix\sthe\sconflict2.test\smodule\swhich\swas\sbroken\sby\scheck-in\s[e30062e9f6c].
 -D 2016-01-04T13:06:53.893
 -F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
++C Merge\sin\slast-minute\spatches\sfor\sthe\s3.10.0\sbeta.
++D 2016-01-04T19:02:47.665
 +F Makefile.in 321a54f5a2843b6752b21f7bd66ce5f96444d1ab
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
 +F Makefile.msc 6fd10748c3f955ca56ac1bc3a45e7c48876c32a3
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -354,11 -334,11 +354,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
- F src/shell.c 4f133a91df78d4664fd0a37cf0a8f51cbd361fda
 -F src/shell.c ed71dc7679e6f087a3f1ea3f9dae4b0fae7209c3
 -F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
++F src/shell.c 40ded7e3ade5f2cc89ab1180994f6a6975ebc6f3
 +F src/sqlite.h.in 686be87fcbaea46b1aa8197a17b7a437d39764fc
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 583ec5b50524c5560f92c065962438a7ab0feea9
 -F src/sqliteInt.h f97614d43833bae0ed6c51ac8e550f0099a1d0ba
++F src/sqliteInt.h 961c445154db6d8240ddc0900aa48c5745c23e80
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -418,13 -398,13 +418,13 @@@ F src/update.c d8d675aa299336ac086ad203
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c a415f7844ba3f67226f49c6e078ce4622dbb6040
 -F src/vdbe.c 6ac8e5d808d48afc369316e147c191102f0584c1
 -F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 66b546a1da82dfa6e67985ae0442ba5fd9efe0ff
 -F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
 -F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
++F src/vdbe.c a479a4bd02b6b77b7ff3ff84825fccc0b967fe6a
 +F src/vdbe.h bfe3f80dba435377cdb64fd917f2529f0f48ab77
 +F src/vdbeInt.h 4f3b46806b93faa92f0511c7ce30ed31aaec65be
 +F src/vdbeapi.c ab2cb8fe23fb9f3195f1311eaa800495d83b6118
- F src/vdbeaux.c e312c85b1215ac101e25edeee421ea2dedb6e8bd
++F src/vdbeaux.c 035470b59cae5af17bda4d2e64197ed0e265fc30
 +F src/vdbeblob.c cc13eca96b8ec51b6248de785a1aec5df11f5805
 +F src/vdbemem.c 25b6cfd665b5073480452426e84136edd94140c0
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
@@@ -1427,7 -1406,7 +1427,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P f6c9273cab877b8b6b327250195f3392393d060a 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
- R 3ae5ccf611905fe16a11d6f29d09eba8
 -P 7adb789f45698e5569b840d23f3f9488db3ed109
 -R 16019d64036d1aa36ba8b50ba392c4e8
++P c0be246a740c8f33a7c07e1414688364dee56ece b779ca8a7580e2a0bb1176316c4540867b635229
++R 667c4c909fff87de213039b9831ec880
  U drh
- Z 208af03429fdf73aeff6e169175e1b1b
 -Z 8bde812e449e210a56672af13ac69445
++Z afff2890aa9dfb1c4b31df554e7505ad

diff --cc manifest.uuid
index 551ecda50e9f9d5078ecc4b7a5f0aa4162b1b362,fa6d00eef8b5c587c9fbeaaf62ccfd041f217e0b..0c7d483566fb46f614742374ec713a7c90a4b032
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c0be246a740c8f33a7c07e1414688364dee56ece
 -b779ca8a7580e2a0bb1176316c4540867b635229
++c785cd7813e4ef6d6f2cb362a0f822713db6bcea

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge