From: drh <drh@noemail.net>
Date: Sat, 15 Jul 2017 20:44:33 +0000 (+0000)
Subject: Merge the fix for ticket [a4e06e75a9ab61a12] from trunk.
X-Git-Tag: version-3.20.0~36^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe8eadc94dc15a77245b7537b1230385caba9161;p=thirdparty%2Fsqlite.git

Merge the fix for ticket [a4e06e75a9ab61a12] from trunk.

FossilOrigin-Name: b64d64c84484162d1822430036ba0483365a39ef4cf82cd6a7b9436d9e9f50c8
---

fe8eadc94dc15a77245b7537b1230385caba9161
diff --cc manifest
index 60eea389ba,a0044545dc..e859ce2f5a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\schange\sto\sone\sof\sthe\scommand-line\sshell\stest\sscripts\sto\smake\sthat\nscript\scompatible\swith\sTcl\s8.5.
- D 2017-07-15T13:49:56.102
 -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 Merge\sthe\sfix\sfor\sticket\s[a4e06e75a9ab61a12]\sfrom\strunk.
++D 2017-07-15T20:44:33.555
  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 035a86ec3e4abd2173bfd0d8666ec86bd85af414cb791e68e6334447ecd35b84
- R 5690770e8de75888850dcde4b004bea0
 -P 687bd478710eb827e041533eea67115464f5a0de767bb6cfdbe36a0d3c597fa1
 -R 522613d16f7d47bea7a7f05e6d39255f
++P 47cf83a0682b7b3219cf255457f5fbe05f3c1f46be42f6bbab33b78a57a252f6 253945d480b052bfe311888022b5eb0be91c8c80cda05036e58207d57520262c
++R fc177602ad383f813078bc7976231f1f
  U drh
- Z a213745e76704ef14d5d7ae1e6163da5
 -Z 4ddd385f7f3a9276d818cfc9da4dbe0b
++Z 72e0051f8920101ae819b65d7e9be4d4
diff --cc manifest.uuid
index ca54978abb,cc1f259bcc..c774bc0dfd
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 47cf83a0682b7b3219cf255457f5fbe05f3c1f46be42f6bbab33b78a57a252f6
 -253945d480b052bfe311888022b5eb0be91c8c80cda05036e58207d57520262c
++b64d64c84484162d1822430036ba0483365a39ef4cf82cd6a7b9436d9e9f50c8