From: drh <drh@noemail.net>
Date: Mon, 17 Jul 2017 13:37:07 +0000 (+0000)
Subject: Merge the pointer-type enhancement from the 3.20 branch.
X-Git-Tag: version-3.20.0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd3028d7e343da999b89dd374526b0d9d59ad323;p=thirdparty%2Fsqlite.git

Merge the pointer-type enhancement from the 3.20 branch.

FossilOrigin-Name: 9e8e1c4aa14bcda165b392d1d8af2ce394a56a8e7b67e4c73c742d8da75e73e2
---

bd3028d7e343da999b89dd374526b0d9d59ad323
diff --cc manifest
index a0044545dc,ed838f39b2..861e277588
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sregister\sallocation\sproblem\sin\sPRAGMA\sintegrity_check\sthat\scaused\nthe\ssame\sregister\sto\sbe\sused\sfor\stwo\sdifferent\spurposes\son\sthe\sfirst\nATTACHed\sdatabase\sif\sthe\sschema\sfor\sthe\sATTACHed\sdatabase\swas\snoticable\nmore\scomplex\sthan\sthe\sschema\sfor\sthe\sfirst\sdatabase.\nFix\sfor\sticket\s[a4e06e75a9ab61a1].
- D 2017-07-15T20:33:19.899
 -C Comment\schanges\sclarifying\sdetails\sof\sthe\spointer-type\sparameter.\s\sNo\nchanges\sto\scode.
 -D 2017-07-17T12:41:29.874
++C Merge\sthe\spointer-type\senhancement\sfrom\sthe\s3.20\sbranch.
++D 2017-07-17T13:37:07.979
  F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@@ -1633,7 -1633,7 +1633,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 687bd478710eb827e041533eea67115464f5a0de767bb6cfdbe36a0d3c597fa1
- R 522613d16f7d47bea7a7f05e6d39255f
 -P e1196567fcbc313657836262ed9f71668b1c47f26e4bc57c7880ff40079d66cc
++P 253945d480b052bfe311888022b5eb0be91c8c80cda05036e58207d57520262c e4579e50a1ece4f65dfdae39d5c1670f0e3f7d4824e7d242f07ec9859d15155f
+ R 44ab723208e3fb1d41d5a4d6b1798a34
  U drh
- Z 4ddd385f7f3a9276d818cfc9da4dbe0b
 -Z e0af31851383293468c221b16ac511da
++Z 494325537ef296d6ee8662e5f6765eae
diff --cc manifest.uuid
index cc1f259bcc,ad53d8b0ee..baaa5c4025
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 253945d480b052bfe311888022b5eb0be91c8c80cda05036e58207d57520262c
 -e4579e50a1ece4f65dfdae39d5c1670f0e3f7d4824e7d242f07ec9859d15155f
++9e8e1c4aa14bcda165b392d1d8af2ce394a56a8e7b67e4c73c742d8da75e73e2