aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2005-06-22 02:36:37 +0000
committerdrh <drh@noemail.net>2005-06-22 02:36:37 +0000
commitedef8fcd73cea22d402dfb2fb91fe88e511207a8 (patch)
tree8663ee2efb7347bfc97794423ee36c29457fb6d5 /src
parent13aebc66f23fda99a10e694a75874ec5a57181c8 (diff)
downloadsqlite-edef8fcd73cea22d402dfb2fb91fe88e511207a8.tar.gz
sqlite-edef8fcd73cea22d402dfb2fb91fe88e511207a8.zip
Fix a bug in an assert found while investigating ticket #1287 but otherwise
unrelated to that problem. (CVS 2522) FossilOrigin-Name: 60f752ed1817e6710c13c2ce393c3bf51dae76ad
Diffstat (limited to 'src')
-rw-r--r--src/vdbe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vdbe.c b/src/vdbe.c
index e2377c893..34928fec5 100644
--- 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;
}