From: drh <drh@noemail.net>
Date: Fri, 1 Jan 2016 14:14:55 +0000 (+0000)
Subject: Merge recent trunk enhancements.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=607d4c2184897dcaed610d6f9219c9aeb113e04b;p=thirdparty%2Fsqlite.git

Merge recent trunk enhancements.

FossilOrigin-Name: 6bea792c3d71be34ccb9c14a0df8a5244d2d3678
---

607d4c2184897dcaed610d6f9219c9aeb113e04b
diff --cc manifest
index 9f6b730781,b08341888c..3cd1f8a841
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2015-12-16T19:55:57.894
 -C Fix\san\sassert()\sthat\smight\sbe\sfalse\sfor\sa\scorrupt\sdatabase.
 -D 2016-01-01T03:37:44.301
++C Merge\srecent\strunk\senhancements.
++D 2016-01-01T14:14:55.896
  F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
+ F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
  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 d8e450a560ec4b141c3c3e6c622386ff51ea972d
 -F src/btree.c 4d3452b2a3daf875490ac4f0a278da7f85fabe12
 -F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
 -F src/btreeInt.h b5f2651b41808f038dee9282c5dc0232ce6532d3
 -F src/build.c 1c9fb552148ee8f9234435a38833f8fca2081a71
++F src/btree.c 90fda80e91d132e617da87eded024079a00e7825
 +F src/btree.h beef31274289a103fa811a7d7adc2dcedbcf2077
- F src/btreeInt.h 99ebf5c9716a8dd1ea6c0583b624e8e0de148d61
- F src/build.c a3fa162b06a16e10136e1693b0eae9998a82b324
++F src/btreeInt.h 2a56cce8bd48f745ab5a767dd9fad8b95a1b0827
++F src/build.c a79c1b5ce704a67d2e98dea89299b03c0923c7a6
  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 8d152e833c3b79825978deb83
  F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 175d7f7b557a27e739d003a0dec53bc807ae8565
 -F src/sqliteInt.h 92f83ab4612141f95cdd663ea55fa4528f3f8c2a
++F src/sqliteInt.h fbda10e359c8f9c8c2d3ac410181f8895d935585
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -395,25 -395,25 +395,25 @@@ F src/tokenize.c 5606871a377f390af7040e
  F src/treeview.c 78842e90c1f71269e7a73a1d4221b6fe360bab66
  F src/trigger.c de3ed31ad3218a20d7d7e18bf1b3b734e78bda66
  F src/update.c 17332f9fe818cbc0444c36a811800af8498af4c3
- F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
+ F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c e802e8e311a0d6c48cd1b3e89db164f6f0248d70
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 39d7628bb8eed10a5378adcf97cca6dce7829a8f
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 75beda4887a498ba0d754f4957a58a8b6e5944b6
++F src/vdbe.c 7a9e701189fda8c348ec16820967a81ede23e836
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 75c2e82ee3357e9210c06474f8d9bdf12c81105d
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c 0331f1d306c971bbf91a5ea16c9f361806dc54c3
 -F src/vdbeaux.c ca523180c128dc6c64894efc61eb14374117c864
++F src/vdbeaux.c 4b69fec971be077fc10b716a00a891c576aef682
  F src/vdbeblob.c fdc4a81605ae7a35ae94a55bd768b66d6be16f15
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c a7ec02da4494c59dfd071126dd3726be5a11459d
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 974928c988681c5157202c79dd9f26afaa7b5086
 -F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
 +F src/wal.c 773ba7c089be217dabc9c7e91941345d2b26d30d
 +F src/wal.h e3ae126b25817dd1e5d779a1aaaa742218de5139
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c b18edbb9e5afabb77f4f27550c471c5c824e0fe7
- F src/whereInt.h e20801d89e34de1912bb6a3babb30c390da27add
+ F src/where.c c6d3d2f6af57d574a7365ee2b225a5024f2a6bec
+ F src/whereInt.h 78b6b4de94db84aecbdc07fe3e38f648eb391e9a
  F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
  F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@@ -1407,7 -1406,7 +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 9130661a786e4c158f15103be57467a5cc03875a f2fc3aede55c8fa0351697f9f5ce4e544334c9af
- R 26f094cebd21cbb0317e6c8d3b9363c4
 -P 6e30f8c6c3af9b0df39783888a1479f88271f989
 -R 6e164f424e8aa8f067cc3a49970e615a
++P cb22efaf50d83d9a73fdf8d986e6ea2fc6500cfb 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
++R 39478d9a81db2701d29b34f08f66f069
  U drh
- Z 6c5488c759c13259d3160e45b371ca92
 -Z 284865b0f74f185e26863aa2df0b68aa
++Z bbe78cb02bb2f030f81296f041199bed
diff --cc manifest.uuid
index e589c1d7b8,7d85a2b67d..6cd16d7094
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cb22efaf50d83d9a73fdf8d986e6ea2fc6500cfb
 -68360cd2211b7ab25dd4ca55a2e82e31f51f2976
++6bea792c3d71be34ccb9c14a0df8a5244d2d3678