From: drh <drh@noemail.net>
Date: Mon, 11 Jan 2016 13:10:41 +0000 (+0000)
Subject: Merge recent enhancements, and especially the WAL overwrite change, from trunk.
X-Git-Tag: version-3.13.0~148^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=604ce70448d0572477ad25bb3510b1dc3f2ad967;p=thirdparty%2Fsqlite.git

Merge recent enhancements, and especially the WAL overwrite change, from trunk.

FossilOrigin-Name: c4a858b228a164be2f89f5b01833f0b5e0d7735b
---

604ce70448d0572477ad25bb3510b1dc3f2ad967
diff --cc manifest
index d3ad8412c9,b94535791e..f98559986f
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\schanges\sfor\sversion\s3.10.0.
- D 2016-01-06T15:14:53.379
 -C Increase\sthe\sversion\snumber\sto\s3.11.0\sdue\sto\sthe\sWAL\soverwrite\senhancement.
 -D 2016-01-11T12:52:55.912
 -F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
++C Merge\srecent\senhancements,\sand\sespecially\sthe\sWAL\soverwrite\schange,\sfrom\strunk.
++D 2016-01-11T13:10:41.337
 +F Makefile.in e3c1e13b4eba06cbb7f9295148383b7e284596be
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
 +F Makefile.msc 6862a51bfd3716bbe3c387c724feb73937b107d2
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
+ F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -305,11 -285,11 +305,11 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c e4655393bb403fa310eef66cc4583d75d4d7fd93
  F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
 -F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
 +F src/delete.c 86e3940d07fe69a40270c2aaf6ca6c7adf19246c
- F src/expr.c 38790e65d1219f2b7dc26458f39a5252fe7c60cd
+ F src/expr.c fe55c489362d1429c364e98c877514f4455f45a6
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e18b3dff7d47c7bcac5ac4fc178a89b9fd322b44
- F src/func.c cf5e10af9125b245f1b962e8ba4d520a37818795
+ F src/func.c ccaf46fa98f795673afbfab73dff7c18db88f3cd
  F src/global.c bd5a0af3f30b0c01be6db756c626cd3c33a3d260
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@@ -353,16 -333,16 +353,16 @@@ F src/printf.c af589a27b7d40f6f4f704e9e
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
+ F src/select.c d84c091185bc160c349e8bf460ebd084dbd77e64
 -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 961c445154db6d8240ddc0900aa48c5745c23e80
 -F src/sqliteInt.h b8ccd34a919e4b6bab8c4164046330002aa9a27a
++F src/sqliteInt.h 09f70fe715a74ea0048ae05526f2a1b6e3a3b6a2
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
- F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
 -F src/tclsqlite.c 82979239a896992f9b78efec81cfda05d316a7d0
++F src/tclsqlite.c b2fa693e57720dc87c18183dd5c0399bf7038ebd
  F src/test1.c 4f1b42699068b7806af3111786f5ad760c2c1ff7
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
@@@ -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 42eefa4f9e7432b9968d321b44e48821ec13b189
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 5d8c7c04e0f677033efb1292248a5f9056bbc34c
 -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/vdbeInt.h 1bff4effc71888e3f304e2e6ac7484e39ab78c28
 +F src/vdbeapi.c ab2cb8fe23fb9f3195f1311eaa800495d83b6118
- F src/vdbeaux.c 13ddc450aa8113660497bcbd244139880b30966c
++F src/vdbeaux.c 77b4a5cbde74f7c3b1d7052c5c4afea89fb20341
 +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
@@@ -1082,7 -1061,7 +1082,7 @@@ F test/tclsqlite.test 7179b4e0bf236ddf0
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 24d971d001a5bb10ef13c27768caed182eb1566e
 -F test/tester.tcl af4749cf4abf04291710c5e73f40bc8f411bae86
++F test/tester.tcl a4b1c8e78ad88426dc0b2375e0b5348d2b841c88
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1427,7 -1407,7 +1428,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 c785cd7813e4ef6d6f2cb362a0f822713db6bcea fd0a50f0797d154fefff724624f00548b5320566
- R bf5c420f78514c3466fbe2f1d92a5b04
 -P d493d4f1186c15da50558a13490cba0191e6f649
 -R a92483f04fb0661e2d9ab2766c996317
++P fa4705c91f9650ecd7ec967dbbf0028aabd8a98c 8e807bfaa197027d0cb73532baa96755ce71ea12
++R 207c595909cfacc40e672adb0642fe8a
  U drh
- Z d51966c7773281c88034ef287a881d30
 -Z d2a7370395d09ae9d2ddb7bbbb25edc7
++Z c05d49256eed75a98851d063f39abe2d
diff --cc manifest.uuid
index 41e5f8540c,7d0842e5bd..252d7d9b65
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fa4705c91f9650ecd7ec967dbbf0028aabd8a98c
 -8e807bfaa197027d0cb73532baa96755ce71ea12
++c4a858b228a164be2f89f5b01833f0b5e0d7735b