Merge changes for version 3.10.0.

FossilOrigin-Name: e1d2ffc06d47b550ca9447a71443dea08b98d1ad

diff --cc manifest
index 3cd1f8a84180b856f9daf3cb3a5b0a4e62d3efb0,84ab4c9e57b033400d0dcba7281a9a79e162e910..8143778f77c14fc7cf102926fba2019ecf59c265
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\strunk\senhancements.
- D 2016-01-01T14:14:55.896
- F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 -C Version\s3.10.0
 -D 2016-01-06T11:01:07.739
++C Merge\schanges\sfor\sversion\s3.10.0.
++D 2016-01-06T15:49:19.937
+ F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
+ F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -276,10 -276,10 +276,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 -F src/btree.c 4d3452b2a3daf875490ac4f0a278da7f85fabe12
 -F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
 -F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
 -F src/build.c d8006e9030c61b9495d0b2f724edd3fcdae16930
 +F src/btree.c 90fda80e91d132e617da87eded024079a00e7825
 +F src/btree.h beef31274289a103fa811a7d7adc2dcedbcf2077
 +F src/btreeInt.h 2a56cce8bd48f745ab5a767dd9fad8b95a1b0827
- F src/build.c a79c1b5ce704a67d2e98dea89299b03c0923c7a6
++F src/build.c 7fcb454e802c35f2b50be9b977dc9168367380e3
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -338,7 -338,7 +338,7 @@@ F src/shell.c ed71dc7679e6f087a3f1ea3f9
  F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h fbda10e359c8f9c8c2d3ac410181f8895d935585
 -F src/sqliteInt.h f97614d43833bae0ed6c51ac8e550f0099a1d0ba
++F src/sqliteInt.h 17f1f082e4f5e0af76ab027034079b153fcad22a
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -357,10 -357,10 +357,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 cd88b616e98347bc6bbe84918ae3f4b8c1267590
  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
@@@ -397,12 -397,12 +397,12 @@@ F src/trigger.c de3ed31ad3218a20d7d7e18
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6ac8e5d808d48afc369316e147c191102f0584c1
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 7a9e701189fda8c348ec16820967a81ede23e836
++F src/vdbe.c 83c09bc78d03c3bc7f596c2698858bc3b7615fd1
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c 4b69fec971be077fc10b716a00a891c576aef682
 -F src/vdbeaux.c 3308a07a6b0b64e22e83cbcc76773eaf330b056a
++F src/vdbeaux.c 83120486af1eb23c9889c0a80572051fa3b8cd00
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
@@@ -523,12 -523,8 +523,12 @@@ F test/collate9.test 3adcc799229545940d
  F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
  F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
 +F test/concfault.test 500f17c3fcfe7705114422bcc6ddd3c740001a43
 +F test/concurrent.test 634b6a88f1942f5d68cc89d4d5efa2b11ba7913c
 +F test/concurrent2.test 77d655c6af93e77803b5c926555a838bb21f922f
 +F test/concurrent3.test 0a5f7e3036d1eccf0782d7153ac21f5f222e9468
  F test/conflict.test 841bcf7cabbfca39c577eb8411ea8601843b46a8
- F test/conflict2.test 0d3af4fb534fa1bd020c79960bb56e4d52655f09
+ F test/conflict2.test a82dd3b9b41fceb5dd6ff0707c5c7ffba208d538
  F test/conflict3.test dec0634c0f31dec9a4b01c63063e939f0cd21b6b
  F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
  F test/corrupt.test 141c39ea650c1365e85a49e402fa05cb9617fb97
@@@ -1409,7 -1406,10 +1409,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 cb22efaf50d83d9a73fdf8d986e6ea2fc6500cfb 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
- R 39478d9a81db2701d29b34f08f66f069
 -P a855697719e288c908ddb7950d32fd17ef546509
 -R 658872c8eaad4f517adfb9642371bf29
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.10.0 *
++P 6bea792c3d71be34ccb9c14a0df8a5244d2d3678 fd0a50f0797d154fefff724624f00548b5320566
++R fa29b06decacdf51ca71abe2a91cec92
  U drh
- Z bbe78cb02bb2f030f81296f041199bed
 -Z 024a1b2bbd235a427c0ebcd39a99300a
++Z 7c114826f0fefe126dc2832b00c1f66c

diff --cc manifest.uuid
index 6cd16d709407fd5e1fd5a530ce587c3a176fc5d0,01d9768cad85a6d7040e5170b3e9c9b5ccd4e0e4..846f1bec7b46d2197c37eb24558f9a4179065336
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6bea792c3d71be34ccb9c14a0df8a5244d2d3678
 -fd0a50f0797d154fefff724624f00548b5320566
++e1d2ffc06d47b550ca9447a71443dea08b98d1ad

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge