From: drh <drh@noemail.net>
Date: Thu, 3 Mar 2016 21:29:10 +0000 (+0000)
Subject: Merge the latest updates from trunk.
X-Git-Tag: version-3.12.0~108^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a05fc913abcfcf0ec71622554cb1f7c034826b88;p=thirdparty%2Fsqlite.git

Merge the latest updates from trunk.

FossilOrigin-Name: 55c00f716dc98b188c91f3a5a010242c9497785f
---

a05fc913abcfcf0ec71622554cb1f7c034826b88
diff --cc manifest
index 0f2eb5c9d9,7f70989146..c50e674c64
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C When\susing\sa\stemporary\sfile\sfor\sa\sstatement\sjournal,\sstore\sthe\sfirst\s64KiB\sin\smemory.\sIf\sthe\sfile\sgrows\slarger\sthan\sthat,\sflush\sit\sto\sdisk\sand\sfree\sthe\smemory.\sHardcoding\sto\s64KiB\sis\sjust\san\sexperiment\sto\scheck\sthat\sthe\smemjournal.c\scode\sworks.
- D 2016-02-29T20:18:21.986
- F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 -C Reduce\sthe\samount\sof\sheap\smemory\srequired\sto\sstore\smany\sschemas\sby\sstoring\s\nthe\scolumn\sdatatype\sappended\sto\sthe\scolumn\sname\s(with\sa\s\\000\sseparator),\s\nrather\sthan\sin\sseparate\smemory\sallocation.
 -D 2016-03-03T21:22:53.735
++C Merge\sthe\slatest\supdates\sfrom\strunk.
++D 2016-03-03T21:29:10.682
+ F Makefile.in e335453db0b16da00c884ad51bb56d1c091a74de
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 4f319afb7c049d40aff7af6e8c4e7cc2ba18e079
+ F Makefile.msc dbd4621ecc585c2ef0c2aa0874698c54675754f1
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -310,11 -310,11 +310,11 @@@ F src/global.c ded7b97efd16efda5062b65e
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 9ca97272e9f74ed0efddf3b4350ee12740cebbef
+ F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 -F src/journal.c fe3a3e2559ce3ce9d371afd30fbabbc074174575
 +F src/journal.c 673cbdde5676eb0c55848f561575d45b609c820d
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c be9309f442ec291177642d2e48e82290e0951f4b
+ F src/main.c 32c45647866429f34d7a13a717172a8e7d0a1056
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -336,9 -336,9 +336,9 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c 3a6f20736dfb8a0949cdd66553fdf59f6604be35
  F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c d034c69b958c01289eb8070cbf902e1a68cd7e0b
 +F src/pager.c 2bc43817697b5a4e88fd6a2cdb2cb25f2223505c
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
- F src/parse.y c3ce2c4a7cbf0b699239be6b2a945c5cb51875e2
+ F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
@@@ -354,7 -354,7 +354,7 @@@ F src/shell.c 5e0ab1e708dc294330ccd8230
  F src/sqlite.h.in 57d2a02b14c9ec4f7cb294153eaf62294dc5aa68
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 3c4ed7e5dcb8b7d4cd4ab258ee7d0e0d0368f014
 -F src/sqliteInt.h 8aa9992cb35289ede0946f7ba8e993070e040fc4
++F src/sqliteInt.h 57da6fd6aa35dff72eb946064ff4999eab6bc616
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1451,7 -1453,8 +1453,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9fd3f7b9c93325a83cdbe7dc9ee312b22a9c2898
- R 498bd0458994e1419985675b963a5c33
- U dan
- Z de04134d7998c131f105dcb3752be845
 -P 3eb74342740cd393e03aa38cd01690ccab173b76 842b21162713bb141b845b01c136457a31af4ab0
 -R 8594cd13d54710bae620a17d4ba5114b
 -T +closed 842b21162713bb141b845b01c136457a31af4ab0
++P 44b2dc18e200e87cf062cb8f1659727c53fa36e9 16fbf2e19c22df9441aef5c8b7f5670adc38a6b6
++R bdaefcabe5bf87c04d8b11c17326d65d
+ U drh
 -Z 4f9819dace7a151b6043885dfe386959
++Z 002d922341500f2c0dc185f71a114083
diff --cc manifest.uuid
index f58d5d3e8e,82610772e0..5a1d0fe44a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 44b2dc18e200e87cf062cb8f1659727c53fa36e9
 -16fbf2e19c22df9441aef5c8b7f5670adc38a6b6
++55c00f716dc98b188c91f3a5a010242c9497785f