From: drh <drh@noemail.net>
Date: Tue, 29 Mar 2016 10:19:29 +0000 (+0000)
Subject: Merge changes for 3.12.0.
X-Git-Tag: version-3.13.0~148^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=799b8372d140a9939b1fce45e24dc29c52456197;p=thirdparty%2Fsqlite.git

Merge changes for 3.12.0.

FossilOrigin-Name: ed22eb653f2809446ace6a27e7ea3926ac6db30c
---

799b8372d140a9939b1fce45e24dc29c52456197
diff --cc manifest
index ff14539e12,769e820b33..a2911f768d
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\sbeta\schanges\sinto\ssessions.
- D 2016-03-24T14:34:26.863
 -C Version\s3.12.0
 -D 2016-03-29T10:14:15.762
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\schanges\sfor\s3.12.0.
++D 2016-03-29T10:19:29.541
 +F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
 +F Makefile.msc e6ee58b849c116d5554024f524cbf61f064f6f01
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -439,13 -419,13 +439,13 @@@ F src/update.c 14c6916d0194a7f25ad42929
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 8873d696c9ccc4206058c402e09e101f1b81561a
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 399bb1d353da8ce2e52e5182aabca18da0296749
 -F src/vdbe.c cd990451b504507b455cc649d46dad51f2835a67
 -F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
 -F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 -F src/vdbeaux.c c8dd3e4e932bede6363b380519d05c0557ad27ce
 -F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
 -F src/vdbemem.c fe76c1f866de362d9b8332e59d74aa44f6560d69
++F src/vdbe.c da8f4d04fb134d7e64fd34d519b0eba4883ed779
 +F src/vdbe.h c16ba943d407baa1c7085eefea73a063fc631863
 +F src/vdbeInt.h 9b704336a69f62ba189eafb06a46171e3463d27b
 +F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
 +F src/vdbeaux.c 03b2a622bf7714153bf06f9a6789e94aad9a5f89
 +F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 +F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
@@@ -1480,7 -1459,10 +1480,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 3296a0ceedef43c2790f0b36471f91138a575243 a1fd14694c1adc54e5c443ebfdef38e38637f5c5
- R 6a48044d31c7e4e91715fbb78d5dfd9f
 -P f6a88cccbc0c62a0b453f4711298c9d5e1882b18
 -R 345c74a0cb9568a53ff6b8825c4a812b
 -T +bgcolor * #d0c0ff
 -T +sym-relaese *
 -T +sym-version-3.12.0 *
++P beb5ea1439995fb8ab112451a8ffcc08fe42d0c4 e9bb4cf40f4971974a74468ef922bdee481c988b
++R 491d941731d06e3edceeb8f36a9265ac
  U drh
- Z be6e3e57ab02c83f1495f1c79794042e
 -Z 9c957a50c25c5de44ce9010b47906f30
++Z 3f9fc483108428866f896f452f439d76
diff --cc manifest.uuid
index ca271aa92a,21845f2bab..b49c17cf93
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- beb5ea1439995fb8ab112451a8ffcc08fe42d0c4
 -e9bb4cf40f4971974a74468ef922bdee481c988b
++ed22eb653f2809446ace6a27e7ea3926ac6db30c