From: drh <drh@noemail.net>
Date: Mon, 2 Nov 2015 18:57:26 +0000 (+0000)
Subject: Merge all recent enhancements and fixes from trunk.
X-Git-Tag: version-3.13.0~148^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2ef7dc05b31100a89b72be939932098dd66c4eb;p=thirdparty%2Fsqlite.git

Merge all recent enhancements and fixes from trunk.

FossilOrigin-Name: 0546d1cd1a3402890edade7970c269cc3f17bc98
---

e2ef7dc05b31100a89b72be939932098dd66c4eb
diff --cc manifest
index 2e418262ca,b6295df2c1..2d04d10a23
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\sthe\slatest\senhancements\sfrom\strunk.
- D 2015-10-30T16:50:00.513
 -C On\sunix,\sif\sa\sfile\sis\sopened\svia\sa\ssymlink,\screate,\sread\sand\swrite\sjournal\sand\swal\sfiles\sbased\son\sthe\sname\sof\sthe\sactual\sdb\sfile,\snot\sthe\ssymlink.
 -D 2015-11-02T15:08:56.877
 -F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
++C Merge\sall\srecent\senhancements\sand\sfixes\sfrom\strunk.
++D 2015-11-02T18:57:26.691
 +F Makefile.in 3229179cfbc7d1378aba248dcbdf5213fff6214a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
 +F Makefile.msc 2ed14817d36a6c26cb146e53b9c8a7318ba5bdd4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -369,10 -349,10 +369,10 @@@ F src/sqliteInt.h b2e72eaa886665d042908
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
  F src/test1.c 9ac5cbfe3c859ab7518edc5109a2959d6bf7b059
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c f7ae1d6a4aa07aac257de18a43800c1199b513fc
+ F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -1418,7 -1398,7 +1419,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 2bbb9595ccc4fdd854bf16a1efcddbc42a7ff14e 7565b046ff939e8310631397a4526fbd98b99aaf
- R 01665c5c372c0e12761e9c423a71cfd1
 -P db319a035feeb6f8fcd04f90fb10cd4b06e68184 c7c8105099c0412ac6c605f98987092c10bde57c
 -R d67684ec76cb9980f2fad9cc50640002
 -U dan
 -Z f0eb56e4c62ba83d5d97aac57baaa5e0
++P 395a153ff7b3c7a72f3d02b6fe76d72383f4e480 6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
++R 108cce56953c38f03dac9fc0349473c4
 +U drh
- Z b4b0651f582925800ad2e9fdf5ebff65
++Z a9e0c02c1ba22a50e60adc1f82d63108
diff --cc manifest.uuid
index a404e6af25,7578737743..1c809979a9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 395a153ff7b3c7a72f3d02b6fe76d72383f4e480
 -6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
++0546d1cd1a3402890edade7970c269cc3f17bc98