From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 16 Sep 2008 09:09:19 +0000 (+0000)
Subject: Set the type of the "comment" field to SQLITE_TEXT when outputing the results of... 
X-Git-Tag: version-3.6.10~473
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e522b498be6e122ab81d678e8acea53d05bff97;p=thirdparty%2Fsqlite.git

Set the type of the "comment" field to SQLITE_TEXT when outputing the results of an EXPLAIN query. (CVS 5704)

FossilOrigin-Name: 5dff20f4bc8d98017e76d3a771ab49310bddda63
---

diff --git a/manifest b/manifest
index 0c1135cdda..1e932cbc45 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\schange\sthe\spage\ssize\safter\sa\spager\shas\sentered\sthe\serror\sstate\s(Pager.errCode!=SQLITE_OK).\sThis\sprevents\san\sassertion\sfailure\sin\svacuum3.test.\s(CVS\s5703)
-D 2008-09-16T05:12:24
+C Set\sthe\stype\sof\sthe\s"comment"\sfield\sto\sSQLITE_TEXT\swhen\soutputing\sthe\sresults\sof\san\sEXPLAIN\squery.\s(CVS\s5704)
+D 2008-09-16T09:09:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -193,7 +193,7 @@ F src/vdbe.c ebc6f6bc8663ca00b6c7ed41bc464023dd6e0483
 F src/vdbe.h 41c99aaad9167c1b5431993db446de74b2f71fc3
 F src/vdbeInt.h b48c74d86a9fb62b707a3186ccca76bb32f1c6be
 F src/vdbeapi.c c0f87aabb2bcf8c760ff9cb289119f7f6ba1797a
-F src/vdbeaux.c 45a53a4459c01db4e6befc977952346bfef405c3
+F src/vdbeaux.c e1198d1ea2e129bd56863794a223da670e1359c7
 F src/vdbeblob.c f93110888ddc246215e9ba1f831d3d375bfd8355
 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7
 F src/vdbemem.c 51538ff193e1fcd462123ccef65323ccd2cc030c
@@ -636,7 +636,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P b134106000e2e694cf5e1e5ae2f5b1e2956ee74a
-R cdc2f80804241449a7b7980720e97dd8
+P aa5c9455be961e712d5c56de8d699adabb186cdc
+R 7a2483a682bc45f299b14a46a88e0b76
 U danielk1977
-Z 91cb718d4a8f6d563442b7b2dfb3b695
+Z 9c3c637b07efde53a208adaf6274b212
diff --git a/manifest.uuid b/manifest.uuid
index b36c80ca65..17136281db 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa5c9455be961e712d5c56de8d699adabb186cdc
\ No newline at end of file
+5dff20f4bc8d98017e76d3a771ab49310bddda63
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 2bf27816ca..42c86204e3 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.409 2008/08/20 22:06:48 drh Exp $
+** $Id: vdbeaux.c,v 1.410 2008/09/16 09:09:20 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -901,6 +901,7 @@ int sqlite3VdbeList(
         pMem->z = pOp->zComment;
         pMem->n = strlen(pMem->z);
         pMem->enc = SQLITE_UTF8;
+        pMem->type = SQLITE_TEXT;
       }else
 #endif
       {