EXPLAIN sets the length of its text return values correctly. Ticket #1583. (CVS...

FossilOrigin-Name: 34b560e81170b33b766a6a7cd462a227425c15d9

diff --git a/manifest b/manifest
index 8fac640cfc7699028b6aba46a29c9b236798ae5d..2378f37ca7009face74c3a549482c9056845c808 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\stable_info\spragma\sshows\scolumn\saffinity\sas\s""\sif\sthere\sis\sno\scolumn\naffinity.\s\sTicket\s#1570.\s(CVS\s3122)
-D 2006-03-03T21:20:17
+C EXPLAIN\ssets\sthe\slength\sof\sits\stext\sreturn\svalues\scorrectly.\s\sTicket\s#1583.\s(CVS\s3123)
+D 2006-03-03T21:38:03
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -93,7 +93,7 @@ F src/vdbe.c 5fb9d3e64ed18f82e71bd2ff94c3e5f07384c7d4
 F src/vdbe.h 80ba1c391ec28180dd07a630577f50b22c2062da
 F src/vdbeInt.h 2109be6b58e3bfcd8e5b56d3b212b1a105a61051
 F src/vdbeapi.c 7dc662e7c905ce666bb506dced932e0307115cbf
-F src/vdbeaux.c 8d5726935c2e3c3a1c8b17caaaa5a03a470de6ff
+F src/vdbeaux.c e7f448c58de1115cecf1d1e0fbb707778b630e00
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/where.c 39af47e7f48be8df8a14a5965a38326bccf8eeed
@@ -355,7 +355,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 43e5462608819e9c2c8bcb4860d4c2d6ecda600c
-R e9ddd59d7d41903afd278f01e6f2d082
+P 5cae8d63d9c83f481bd2fbbcfed69df631062651
+R 321984c0cd1d1a4974e886e15ee8340d
 U drh
-Z 0469b7625b6db7391e7c965b77b7a27c
+Z 87599cdfc4c756e51de2d1392918b4fa

diff --git a/manifest.uuid b/manifest.uuid
index b9adadbfe490c271cdeada8eec670efda5449e10..986d108dc21f98f47612b0b47136f026c8b9f424 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5cae8d63d9c83f481bd2fbbcfed69df631062651
\ No newline at end of file
+34b560e81170b33b766a6a7cd462a227425c15d9
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 7f7bb90dfac05e29bebaad70fe9f5e73c3e383b4..09777ffed782750248243921304416f668f94bf8 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -656,8 +656,9 @@ int sqlite3VdbeList(
     pMem->type = SQLITE_INTEGER;
     pMem++;
 
-    pMem->flags = MEM_Short|MEM_Str|MEM_Term;   /* P3 */
+    pMem->flags = MEM_Ephem|MEM_Str|MEM_Term;   /* P3 */
     pMem->z = displayP3(pOp, pMem->zShort, sizeof(pMem->zShort));
+    pMem->n = strlen(pMem->z);
     pMem->type = SQLITE_TEXT;
     pMem->enc = SQLITE_UTF8;