From: drh <drh@noemail.net>
Date: Sat, 1 Apr 2017 20:44:26 +0000 (+0000)
Subject: Remove an unnecessary setting of the Mem.enc field for the output of the
X-Git-Tag: version-3.19.0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e633b3ba9d0efbb3637312420ee4ffdd3e44e08;p=thirdparty%2Fsqlite.git

Remove an unnecessary setting of the Mem.enc field for the output of the
OP_Record opcode, for a performance improvement and size reduction.

FossilOrigin-Name: e6e36b288fdf21b7ff7f0bf85d2225b6505f54367b183c302c93c34a4a40b8b5
---

diff --git a/manifest b/manifest
index e8f78f99ed..78dd3266f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sperformance\senhancements\sto\sthe\sOP_Affinity\sopcode.
-D 2017-04-01T20:14:01.312
+C Remove\san\sunnecessary\ssetting\sof\sthe\sMem.enc\sfield\sfor\sthe\soutput\sof\sthe\nOP_Record\sopcode,\sfor\sa\sperformance\simprovement\sand\ssize\sreduction.
+D 2017-04-01T20:44:26.383
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -468,7 +468,7 @@ F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
 F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
-F src/vdbe.c 73ddbad81e181cd97db84a654d9f4e0e2a1cffe5ada55d2d415730bb92ba9154
+F src/vdbe.c d275c79e5e23f5208da106bd8e04206dff373a9797f07ab01d64af139a0301fd
 F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
 F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
 F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
@@ -1569,7 +1569,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fcd2acdd6075aa9a7a66ce254eba77485f7b2804127e109c0309173488cd4b87
-R b2865bd21e6736872cabd9a653d63ed6
+P c45cd3b947c0f03a688f827fddb4629a986788f0dd98d5ef899f11e68ff1c202
+R 9110f45f53ee5a3c301af47a0be3a540
 U drh
-Z b3718432a24e2278ab854298acb77351
+Z db07b81eed986b15417f2526357a7c90
diff --git a/manifest.uuid b/manifest.uuid
index 7d8d3f0fe3..af50b4417d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c45cd3b947c0f03a688f827fddb4629a986788f0dd98d5ef899f11e68ff1c202
\ No newline at end of file
+e6e36b288fdf21b7ff7f0bf85d2225b6505f54367b183c302c93c34a4a40b8b5
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index feccb424ec..7056d20aaa 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2892,7 +2892,6 @@ case OP_MakeRecord: {
     pOut->u.nZero = nZero;
     pOut->flags |= MEM_Zero;
   }
-  pOut->enc = SQLITE_UTF8;  /* In case the blob is ever converted to text */
   REGISTER_TRACE(pOp->p3, pOut);
   UPDATE_MAX_BLOBSIZE(pOut);
   break;