Use OP_Copy instead of OP_SCopy when moving results out of a subquery,

to prevent the subquery results from changing out from under the outer
query.  Fix for ticket [1e64dd782a126f48d78].

FossilOrigin-Name: ec6a06246e04eee5f25f1c28507df73b697099c0

diff --git a/manifest b/manifest
index 1b0b98e40a82a10d308bb09413786d0ae75a7877..c2b727fd2253aae07f66f9ca9e8d3792180fc356 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.8.4.2
-D 2014-03-26T18:51:19.353
+C Use\sOP_Copy\sinstead\sof\sOP_SCopy\swhen\smoving\sresults\sout\sof\sa\ssubquery,\nto\sprevent\sthe\ssubquery\sresults\sfrom\schanging\sout\sfrom\sunder\sthe\souter\nquery.\s\sFix\sfor\sticket\s[1e64dd782a126f48d78].
+D 2014-04-03T16:16:36.087
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -291,7 +291,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c bb50b5aed4f9b2284eb92c944253e60df2fb8259
+F src/where.c 7e56746cb33715baf3c2e78ea6216aaf7229a535
 F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1156,10 +1156,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 59978a2e425e6f53853a4ad9dc9c7229476091fa
-R 9cacf50647b82d868fed3d2e303cd494
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.8.4.2 *
+P 02ea166372bdb2ef9d8dfbb05e78a97609673a8e
+R 389acb6e4dd6103b4ea80a6d92c6b43f
 U drh
-Z 9e05cfd75bb088dfbac3237229b216bf
+Z 7258da5426dca37d98c8d457554c4020

diff --git a/manifest.uuid b/manifest.uuid
index 611ed6795b692f541db2359bdef627d2c6fceef6..aa757a0f9273d6813ba6d4f604bce90b66cd43e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02ea166372bdb2ef9d8dfbb05e78a97609673a8e
\ No newline at end of file
+ec6a06246e04eee5f25f1c28507df73b697099c0
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 6cd9c167a19f43565386765d8f60414ef98e3274..d8389a4d6994c5cbf2f142c6bb0ecc4667df5adf 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -5880,7 +5880,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       for(; k<last; k++, pOp++){
         if( pOp->p1!=pLevel->iTabCur ) continue;
         if( pOp->opcode==OP_Column ){
-          pOp->opcode = OP_SCopy;
+          pOp->opcode = OP_Copy;
           pOp->p1 = pOp->p2 + pTabItem->regResult;
           pOp->p2 = pOp->p3;
           pOp->p3 = 0;