Use OP_Copy rather than OP_SCopy at one point in aggregate processing where

it is needed to avoid shallow-copy misuse.

FossilOrigin-Name: a5eefd5239bf5b4f9d0bdfb312f5b33c0a196178

diff --git a/manifest b/manifest
index 21d77e79eea95916c442239ff09e3d306639a94d..215e3e312a802956fcb50becd8d1218512ae77ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Continuing\swork\stoward\sdetecting\sand\sfixing\sshallow-copy\smisuse.
-D 2010-09-28T00:25:59
+C Use\sOP_Copy\srather\sthan\sOP_SCopy\sat\sone\spoint\sin\saggregate\sprocessing\swhere\nit\sis\sneeded\sto\savoid\sshallow-copy\smisuse.
+D 2010-09-28T03:55:03
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/printf.c 8ae5082dd38a1b5456030c3755ec3a392cd51506
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c b0b124781474e4e0c8f64022875e5e2009e13443
+F src/select.c cf3013b1953348c7c6ff9636342e87b9fda68466
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
 F src/sqlite.h.in dae3f74d7b2b516967ede39b8e503718b571d9da
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
@@ -870,14 +870,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8b8e1732e8410efd5f8e308c43abe521584e87a0
-R 6e7ffc38beed1359e7a9763da2484bfb
+P d0342f4bb9d25dd1dba3957778faa993fb9cc81c
+R 16dd6c78a696d651854b421ee534566c
 U drh
-Z f8752ab05737fec30725df8f72240df9
+Z 4a453c5f4cf28cf528b0f5f5e2516331
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMoTYaoxKgR168RlERAuAoAJwOk2B2UJoKqsTRac6+nfXRusJjSwCfTXtE
-5iMBVntYhX3w248Zh7Tlk4Q=
-=B2vQ
+iD8DBQFMoWcboxKgR168RlERAqEbAJ9Sj7+X+bLVtX69M2DquI9xnDygMwCeIAg1
+Rsdjw2kXv6T6/m0kOdhbDK8=
+=iNuQ
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 96a4cd1d3330ecb9986cf68976c9cdc8eabbe5b9..a2fa6ceb473aa15a94193ee39e065577062fcf82 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d0342f4bb9d25dd1dba3957778faa993fb9cc81c
\ No newline at end of file
+a5eefd5239bf5b4f9d0bdfb312f5b33c0a196178
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index b308e83e4f2c3ed429898fe7942e086f2688607b..2e581c68bd8143d29fa6b1a4bdd4c5172895afa4 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3465,7 +3465,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
     if( pList ){
       nArg = pList->nExpr;
       regAgg = sqlite3GetTempRange(pParse, nArg);
-      sqlite3ExprCodeExprList(pParse, pList, regAgg, 0);
+      sqlite3ExprCodeExprList(pParse, pList, regAgg, 1);
     }else{
       nArg = 0;
       regAgg = 0;