Make sure zeroblob() works with the concatenation operator. Ticket #2379. (CVS 4028)

FossilOrigin-Name: 6e19ef758207cedd6db8b2796ef5d4d688cc0b62

diff --git a/manifest b/manifest
index 002902bf9cd97930b89a435900813c32c6ecada9..6c097819c02c064ca3fa9232c2d7f2556053f756 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\snumber\sof\srepititions\sin\scrash.test.\s(CVS\s4027)
-D 2007-05-23T06:25:13
+C Make\ssure\szeroblob()\sworks\swith\sthe\sconcatenation\soperator.\s\sTicket\s#2379.\s(CVS\s4028)
+D 2007-05-23T06:31:39
 F Makefile.in a42354804b50c2708ce72cf79e4daa30f50191b5
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -133,7 +133,7 @@ F src/update.c 3359041db390a8f856d67272f299600e2104f350
 F src/utf.c 73134f4d3e44686ef5abd877f4fb1290b75f3311
 F src/util.c 80cdf6b68d03b8f0ab3237a390842e039cff66c6
 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
-F src/vdbe.c 38e902e80e36008c29638520d59cb1b88b997dbb
+F src/vdbe.c 74a82e8dc0cd84416fcca63d158c5ab8715f158d
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h 7d2bf163d6d4e815724a457f2216dd8e38c3955c
 F src/vdbeapi.c f89d6bc5264e66f44589e454fbeeee96854d0dd3
@@ -418,7 +418,7 @@ F test/where.test 5c342d6ad0d777275d4740ea5cbeaf5173b6eda4
 F test/where2.test 3249d426b3fc7a106713d784e1628307fc308d2e
 F test/where3.test 0a30fe9808b0fa01c46d0fcf4fac0bf6cf75bb30
 F test/where4.test b68496500bff496e83e76ae4ffb493b99064eac6
-F test/zeroblob.test 204b54e8adb29f5ec466ff789734098802099d90
+F test/zeroblob.test 12a3a44cb5c60816af4a38e4ab8713e83bf5e252
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/lemon.c c8c8b25ab1ac8156b3ad83ba4ea1bf00d5e07f5a
@@ -494,7 +494,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P ed3a131f1d3fe51d1e79bdfe1bfafa55f825afa9
-R ecb9d9a11d5fd4fc118cc73caa42f7c8
-U danielk1977
-Z 878195d8d740a1b73f158bebb97ceae6
+P f3c3412afa95e7e4b2e6477718785b51f5352c39
+R be1ade13052f97e4c5360ea8823361db
+U drh
+Z acf5b62f956d717ae98df8f752c497d0

diff --git a/manifest.uuid b/manifest.uuid
index 438eae51e6e67f71812eb5dd8abb1ab2afcc613f..465dcd486a2b2270631c8bf7c5df602ac033da66 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3c3412afa95e7e4b2e6477718785b51f5352c39
\ No newline at end of file
+6e19ef758207cedd6db8b2796ef5d4d688cc0b62
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 7ea40992cbdb8246becc5e830dc66f765a0b3df8..3e2270a34b8da919c40251fad9965ed4dee79f8b 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.622 2007/05/17 16:38:30 danielk1977 Exp $
+** $Id: vdbe.c,v 1.623 2007/05/23 06:31:39 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1033,6 +1033,7 @@ case OP_Concat: {           /* same as TK_CONCAT */
       nByte = -1;
       break;
     }
+    ExpandBlob(pTerm);
     Stringify(pTerm, encoding);
     nByte += pTerm->n;
   }

diff --git a/test/zeroblob.test b/test/zeroblob.test
index 69c4719ac254aa75092cacb55634ce258ef2d6d7..5763559a03441dbdf3a5619126bd479139cc9749 100644 (file)
--- a/test/zeroblob.test
+++ b/test/zeroblob.test
@@ -13,7 +13,7 @@
 # including the sqlite3_bind_zeroblob(), sqlite3_result_zeroblob(),
 # and the built-in zeroblob() SQL function.
 #
-# $Id: zeroblob.test,v 1.3 2007/05/17 06:44:29 danielk1977 Exp $
+# $Id: zeroblob.test,v 1.4 2007/05/23 06:31:39 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -119,6 +119,14 @@ do_test zeroblob-3.1 {
     )
   }
 } {1}
+
+# Concatentation works with zeroblob
+#
+do_test zeroblob-4.1 {
+  execsql {
+    SELECT hex(zeroblob(2) || x'61')
+  }
+} {000061}
   
 
 finish_test