Merge changes for version 3.10.0.

FossilOrigin-Name: fa4705c91f9650ecd7ec967dbbf0028aabd8a98c

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 9ffb7e1a70fd8648bd73a1a5d0aa8f06f61dd1f4,84ab4c9e57b033400d0dcba7281a9a79e162e910..d3ad8412c99f643a54b595b7ae956e3af97447eb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sin\slast-minute\spatches\sfor\sthe\s3.10.0\sbeta.
- D 2016-01-04T19:02:47.665
- F Makefile.in 321a54f5a2843b6752b21f7bd66ce5f96444d1ab
 -C Version\s3.10.0
 -D 2016-01-06T11:01:07.739
 -F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
++C Merge\schanges\sfor\sversion\s3.10.0.
++D 2016-01-06T15:14:53.379
++F Makefile.in e3c1e13b4eba06cbb7f9295148383b7e284596be
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 6fd10748c3f955ca56ac1bc3a45e7c48876c32a3
 -F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
++F Makefile.msc 6862a51bfd3716bbe3c387c724feb73937b107d2
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -277,7 -257,7 +277,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 238ecdee438a8b0ff662ac9e739899cacaae668c
 -F main.mk 20e46c09ac8732a74a9e2d55e8d90257d97eb844
++F main.mk 727b093cca39460048ae9948b283063857b04402
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -377,10 -357,10 +377,10 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
 +F src/test_config.c a0e8eeb86a7d9393f3bbf7315932c1cccd0e8010
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_fs.c 993c7eab65bed6add4bb48cca29775e963f710cf
+ F src/test_fs.c a61f54247fdb843761d709879c3bcd1989b2050c
  F src/test_func.c 0d9c25956152adefee8881c6fadc8354793764d0
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
@@@ -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 6ac8e5d808d48afc369316e147c191102f0584c1
 -F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 3308a07a6b0b64e22e83cbcc76773eaf330b056a
 -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 035470b59cae5af17bda4d2e64197ed0e265fc30
++F src/vdbeaux.c 13ddc450aa8113660497bcbd244139880b30966c
 +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,10 +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 c0be246a740c8f33a7c07e1414688364dee56ece b779ca8a7580e2a0bb1176316c4540867b635229
- R 667c4c909fff87de213039b9831ec880
 -P a855697719e288c908ddb7950d32fd17ef546509
 -R 658872c8eaad4f517adfb9642371bf29
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.10.0 *
++P c785cd7813e4ef6d6f2cb362a0f822713db6bcea fd0a50f0797d154fefff724624f00548b5320566
++R bf5c420f78514c3466fbe2f1d92a5b04
  U drh
- Z afff2890aa9dfb1c4b31df554e7505ad
 -Z 024a1b2bbd235a427c0ebcd39a99300a
++Z d51966c7773281c88034ef287a881d30

diff --cc manifest.uuid
index 0c7d483566fb46f614742374ec713a7c90a4b032,01d9768cad85a6d7040e5170b3e9c9b5ccd4e0e4..41e5f8540cc57b5995d27ec9f95fad6e8c65289c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c785cd7813e4ef6d6f2cb362a0f822713db6bcea
 -fd0a50f0797d154fefff724624f00548b5320566
++fa4705c91f9650ecd7ec967dbbf0028aabd8a98c

diff --cc src/vdbeaux.c
Simple merge