From: drh <drh@noemail.net>
Date: Sat, 30 Jan 2016 15:52:39 +0000 (+0000)
Subject: Only honor the register subtype value if the MEM_Subtype flag is set.
X-Git-Tag: version-3.11.0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8d66dc4ec99cfd3d82afe5b6243a000d0d409cb;p=thirdparty%2Fsqlite.git

Only honor the register subtype value if the MEM_Subtype flag is set.
Revised and improved fix for ticket [f45ac567eaa9f9].

FossilOrigin-Name: 1f4c667f37d63fc3ef2e8f2581ecd3a66c054426
---

b8d66dc4ec99cfd3d82afe5b6243a000d0d409cb
diff --cc manifest
index c42504832e,16ab0b16b9..df7711094d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Output\ssubtype\sinformation\son\sregister\straces\sfor\sPRAGMA\svdbe_trace.
- D 2016-01-30T14:17:10.486
 -C A\sdifferent\sway\sto\sclear\sthe\ssubtype\son\sVDBE\sregisters\swhen\sthe\svalue\sof\sthe\sregister\sis\soverwritten\swith\snew\scontent.\sTo\sfix\s[[f45ac567eaa9f93].
 -D 2016-01-30T15:46:03.527
++C Only\shonor\sthe\sregister\ssubtype\svalue\sif\sthe\sMEM_Subtype\sflag\sis\sset.\nRevised\sand\simproved\sfix\sfor\sticket\s[f45ac567eaa9f9].
++D 2016-01-30T15:52:39.136
  F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@@ -1422,7 -1422,10 +1422,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 85c467041c9378cae3038756da815e9117ee8c7d
- R 694b551c33162b646e920ddc57abdc60
 -P 96b780209cc95c3f3769bb880591380d94bfe38d
++P 96b780209cc95c3f3769bb880591380d94bfe38d 2e9fb1295cd31fc29c97444c3dec82fef68e939f
+ R bd3d63263e82ae4209cc8f920c59f1ec
 -T *branch * clear-subtype-flag
 -T *sym-clear-subtype-flag *
 -T -sym-trunk *
 -U dan
 -Z b20671d59699e15a0872203a064b7cf5
++T +closed 2e9fb1295cd31fc29c97444c3dec82fef68e939f
 +U drh
- Z fd54d0de297ea145965f78cad2cde9ad
++Z 5703eae66c478a55119b68d54c8bb9ef
diff --cc manifest.uuid
index 6041e7c246,5e49703813..f4551f775a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 96b780209cc95c3f3769bb880591380d94bfe38d
 -2e9fb1295cd31fc29c97444c3dec82fef68e939f
++1f4c667f37d63fc3ef2e8f2581ecd3a66c054426