Fix a bug in an assert found while investigating ticket #1287 but otherwise

unrelated to that problem. (CVS 2522)

FossilOrigin-Name: 60f752ed1817e6710c13c2ce393c3bf51dae76ad

diff --git a/manifest b/manifest
index 1717efa6176648b38390bd8854287c9bcb73b1e9..43dfd0e289b4b0abc3758aca68f5ac14b4f4e37d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sdocumentation\sto\sexplain\sthat\sa\sdatabase\shandle\scan\sonly\sbe\nused\sin\sthe\ssame\sthread\sin\swhich\sit\swas\screated.\s\sTicket\s#1272.\s(CVS\s2521)
-D 2005-06-16T19:48:39
+C Fix\sa\sbug\sin\san\sassert\sfound\swhile\sinvestigating\sticket\s#1287\sbut\sotherwise\nunrelated\sto\sthat\sproblem.\s(CVS\s2522)
+D 2005-06-22T02:36:37
 F Makefile.in 64a6635ef44a98325e0cffe8d67669920a3dad47
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -77,7 +77,7 @@ F src/update.c e96c7b342cd8903c672162f4cf84d2c737943347
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
 F src/util.c 1cdce9ae9fd17307e00848d63e3bc3300ca7c9fc
 F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c
-F src/vdbe.c c2511f392598928254504e3b2c5ec47f4fef2b53
+F src/vdbe.c 4745b575d9f23a960da0ce8334f99b98ea855265
 F src/vdbe.h 75e466d84d362b0c4498978a9d6b1e6bd32ecf3b
 F src/vdbeInt.h 4312faf41630a6c215924b6c7c2f39ebb1af8ffb
 F src/vdbeapi.c 3f858d2236df0d127249a6a166e0e25b5de650ed
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 98a4de76e0593ef1d1d3e8b785d420cd554a08e8
-R 066b49d2a4cff736f75321641f980036
+P 59c95731f70ed9b9e135584f62d0a2b0f1a3bb96
+R 446ed8445a101f560ead4db2a96c0b93
 U drh
-Z 6ffd2eee9b1958837812c18f5ad7610d
+Z c13f27ef7404ed30108e450cbb1c3c08

diff --git a/manifest.uuid b/manifest.uuid
index 613c1c0ec8d6ab2518996d4019298e77ec1b38ec..230c47e7181cecfefd091abea1bb8a4f2dd5ee6a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59c95731f70ed9b9e135584f62d0a2b0f1a3bb96
\ No newline at end of file
+60f752ed1817e6710c13c2ce393c3bf51dae76ad
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index e2377c89371b0e39865f58ec84f0b79e97fd5eac..34928fec5d4c2a8c3020f30bc2d034eccc325120 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.469 2005/06/12 21:35:53 drh Exp $
+** $Id: vdbe.c,v 1.470 2005/06/22 02:36:37 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1000,7 +1000,7 @@ case OP_Concat: {           /* same as TK_CONCAT */
     pTerm = &pTos[1-nField];
     for(i=j=0; i<nField; i++, pTerm++){
       int n = pTerm->n;
-      assert( pTerm->flags & MEM_Str );
+      assert( pTerm->flags & (MEM_Str|MEM_Blob) );
       memcpy(&zNew[j], pTerm->z, n);
       j += n;
     }